From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id k7WnNZpU1GGvIwAAWB0awg (envelope-from ) for ; Tue, 04 Jan 2022 09:07:22 -0500 Received: by simark.ca (Postfix, from userid 112) id C81FF1F0DB; Tue, 4 Jan 2022 09:07:22 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-3.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 3D7AF1ECEB for ; Tue, 4 Jan 2022 09:07:22 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C15B83858005 for ; Tue, 4 Jan 2022 14:07:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C15B83858005 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1641305241; bh=0mnFAtwZh26NDNJZiFvmM3nnvzYRCG37gRaf3fLMVXg=; h=Date:To:Subject:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=emhMOEiCZNS50G3ttC2mNPqI9oJoVlkhIKdeB2nEBZQXsLdQotP1h7tTmHYY/dQD2 QFFeiPYEsG+7sGliekMF92to9fRzfGyfabGDv1Fv3Scme11XmtzzIWLkfawSvOG7Px vB/I4O/gj/m3Hu3B9DDukAwXM4E+QA1jsF7hNkdQ= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 51D333858C2C for ; Tue, 4 Jan 2022 14:07:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 51D333858C2C Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-47-86kNn31aN_qx-bpvMqKDtQ-1; Tue, 04 Jan 2022 09:07:01 -0500 X-MC-Unique: 86kNn31aN_qx-bpvMqKDtQ-1 Received: by mail-wm1-f71.google.com with SMTP id l20-20020a05600c1d1400b003458e02cea0so17563656wms.7 for ; Tue, 04 Jan 2022 06:07:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=0mnFAtwZh26NDNJZiFvmM3nnvzYRCG37gRaf3fLMVXg=; b=ng1dnIEvzW2TzjFBP185D4jBYWb3ODccL9gHArA+9sB+IXfBdkQbyX+xZmZnOG03Gh IUQrW8Z4WkRf3VMaH9Gb1xzSCwpVTwGx7rWpHaV4HKsNWktyiiT0WovAxJqNViAaYbcI vHbNCgU2mxHkPNCVxixWNbLhSFeuexG98WlLXqJJjTIAgkQSwj6w1giBf6CrRkfjqtqg SJIyWWR3utsULQYHUJbFOYSOOHFs7plZui5BdAmlMo6PuvUAuQBoVyhj8IrK+DRM/7lh fwpJEue6SkZ0AMB89t7pNSukV9TGHCsVYgyS25zwmeqG3PAUIM0SYRDBPqitwDW/ZQqV MVDQ== X-Gm-Message-State: AOAM532d7u4EJZ7jm9bZDZ5Yi2475bJd2xSJMPRN1SokrDfIlgZRa8ZS lSOrxD9aZpgLQrSxjfls9J6WT/mzGMM9rlt1bfk36QAtgV45uzOeLNjzqmp+IGJpUY/IYk0gFn0 RKwEBIMAHOgigehuYxNze+Q== X-Received: by 2002:adf:ec8b:: with SMTP id z11mr43292846wrn.378.1641305220514; Tue, 04 Jan 2022 06:07:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJyj812j4i0Rsgxgwq01WRTQb2w2DQpC6VO3+130O3JINLB8ycUbGuSyc94zsYYl1niPlE8G3g== X-Received: by 2002:adf:ec8b:: with SMTP id z11mr43292839wrn.378.1641305220367; Tue, 04 Jan 2022 06:07:00 -0800 (PST) Received: from localhost (host109-154-163-67.range109-154.btcentralplus.com. [109.154.163.67]) by smtp.gmail.com with ESMTPSA id i1sm39190434wml.26.2022.01.04.06.06.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:06:59 -0800 (PST) Date: Tue, 4 Jan 2022 14:06:59 +0000 To: Lancelot SIX Subject: Re: [PATCH 04/29] gdb/testsuite: Remove duplicates from gdb.base/realname-expand.exp Message-ID: <20220104140659.GE1845520@redhat.com> References: <20211121175636.779325-1-lsix@lancelotsix.com> <20211121175636.779325-5-lsix@lancelotsix.com> MIME-Version: 1.0 In-Reply-To: <20211121175636.779325-5-lsix@lancelotsix.com> X-Operating-System: Linux/5.8.18-100.fc31.x86_64 (x86_64) X-Uptime: 14:06:44 up 2 days, 23:00, X-Editor: GNU Emacs [ http://www.gnu.org/software/emacs ] X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Andrew Burgess via Gdb-patches Reply-To: Andrew Burgess Cc: gdb-patches@sourceware.org Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" * Lancelot SIX via Gdb-patches [2021-11-21 17:56:11 +0000]: > When running the testsuite, I have: > > Running .../gdb/testsuite/gdb.base/realname-expand.exp ... > DUPLICATE: gdb.base/realname-expand.exp: set basenames-may-differ on > > This is due to the fact that the test restarts GDB twice and each time > sets the basenames-may-differ setting. This patch proposes to fix this > by not restarting GDB so the setting is maintained. It just clears the > breakpoints between the two tests and updates the breakpoints number as > required. > > This patch also perform some minor refactorings to improve > visibility. LGTM. Thanks, Andrew > > Tested on x86_64-linux. > --- > gdb/testsuite/gdb.base/realname-expand.exp | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/gdb/testsuite/gdb.base/realname-expand.exp b/gdb/testsuite/gdb.base/realname-expand.exp > index ffe2f85e812..80bc4e0ab22 100644 > --- a/gdb/testsuite/gdb.base/realname-expand.exp > +++ b/gdb/testsuite/gdb.base/realname-expand.exp > @@ -40,10 +40,12 @@ clean_restart ${testfile} > > gdb_test_no_output "set basenames-may-differ on" > > -gdb_test "rbreak realname-expand-real.c:func" "^rbreak realname-expand-real.c:func\r\nBreakpoint 1 at 0x\[0-9a-f\]+: file \[^\r\n\]*/realname-expand-link\\.c, line \[0-9\]+\\.\r\nvoid func\\(void\\);" > +gdb_test "rbreak realname-expand-real.c:func" \ > + [multi_line "" \ > + "Breakpoint 1 at $hex: file \[^\r\n\]*/realname-expand-link\\.c, line $decimal\\." \ > + "void func\\(void\\);"] > > -clean_restart ${testfile} > - > -gdb_test_no_output "set basenames-may-differ on" > +delete_breakpoints > > -gdb_test "break realname-expand-real.c:func" "^break realname-expand-real.c:func\r\nBreakpoint 1 at 0x\[0-9a-f\]+: file \[^\r\n\]*/realname-expand-link\\.c, line \[0-9\]+\\." > +gdb_test "break realname-expand-real.c:func" \ > + "\r\nBreakpoint 2 at $hex: file \[^\r\n\]*/realname-expand-link\\.c, line $decimal\\." > -- > 2.33.1 >