From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id EAE55393C89D for ; Tue, 12 May 2020 08:29:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org EAE55393C89D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tdevries@suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id C7754ACF0 for ; Tue, 12 May 2020 08:29:21 +0000 (UTC) Date: Tue, 12 May 2020 10:29:17 +0200 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [committed][gdb/testsuite] Fix duplicate test-names in gdb.{gdb,opt,xml} Message-ID: <20200512082915.GA24388@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-19.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org 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: , X-List-Received-Date: Tue, 12 May 2020 08:29:21 -0000 Hi, There are 3 test directories with one duplicate test-name: gdb.gdb, gdb.opt and gdb.xml. The duplicates are: ... DUPLICATE: gdb.gdb/complaints.exp: call complaint_internal ($cstr) DUPLICATE: gdb.opt/inline-locals.exp: info locals above bar 2 \ (PRMS: gdb/25695) DUPLICATE: gdb.xml/tdesc-regs.exp: ptype $extrareg ... Fix as appropriate. Tested on x86_64-linux. Committed to trunk. Thanks, - Tom [gdb/testsuite] Fix duplicate test-names in gdb.{gdb,opt,xml} gdb/testsuite/ChangeLog: 2020-05-12 Tom de Vries * gdb.gdb/complaints.exp: Use with_test_prefix. * gdb.xml/tdesc-regs.exp: Same. * gdb.opt/inline-locals.exp: Fix test name. --- gdb/testsuite/gdb.gdb/complaints.exp | 8 +++++--- gdb/testsuite/gdb.opt/inline-locals.exp | 2 +- gdb/testsuite/gdb.xml/tdesc-regs.exp | 8 +++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/gdb/testsuite/gdb.gdb/complaints.exp b/gdb/testsuite/gdb.gdb/complaints.exp index b4a5ab3087..922530caa5 100644 --- a/gdb/testsuite/gdb.gdb/complaints.exp +++ b/gdb/testsuite/gdb.gdb/complaints.exp @@ -65,9 +65,11 @@ proc test_initial_complaints { } { "During symbol reading: Register a complaint" # Re-issue the first message #1 - gdb_test_stdio \ - "call complaint_internal (\$cstr)" \ - "During symbol reading: Register a complaint" + with_test_prefix "re-issue" { + gdb_test_stdio \ + "call complaint_internal (\$cstr)" \ + "During symbol reading: Register a complaint" + } # Add a second complaint, expect it gdb_test_stdio \ diff --git a/gdb/testsuite/gdb.opt/inline-locals.exp b/gdb/testsuite/gdb.opt/inline-locals.exp index 3dee0aabfe..8104b0f5b7 100644 --- a/gdb/testsuite/gdb.opt/inline-locals.exp +++ b/gdb/testsuite/gdb.opt/inline-locals.exp @@ -95,7 +95,7 @@ if { ! $no_frames } { set pass_re "array = {$decimal, \[^\r\n\]*}" set kfail_re [multi_line $pass_re \ "array = { }"] - gdb_test_multiple "info locals" "info locals above bar 2" { + gdb_test_multiple "info locals" "info locals above bar 3" { -re -wrap $pass_re { pass $gdb_test_name } diff --git a/gdb/testsuite/gdb.xml/tdesc-regs.exp b/gdb/testsuite/gdb.xml/tdesc-regs.exp index 1ec20a1944..bb04420b24 100644 --- a/gdb/testsuite/gdb.xml/tdesc-regs.exp +++ b/gdb/testsuite/gdb.xml/tdesc-regs.exp @@ -184,6 +184,8 @@ gdb_test "ptype \$mixed_flags" \ gdb_test "maintenance print reggroups" \ " Group\[ \t\]+Type\[ \t\]+\r\n.* general\[ \t\]+user\[ \t\]+\r\n.* foo\[ \t\]+user\[ \t\]+" -load_description "core-only.xml" "" "test-regs.xml" -# The extra register from the previous description should be gone. -gdb_test "ptype \$extrareg" "type = void" +with_test_prefix "core-only.xml" { + load_description "core-only.xml" "" "test-regs.xml" + # The extra register from the previous description should be gone. + gdb_test "ptype \$extrareg" "type = void" +}