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 DA37A389781D for ; Tue, 12 May 2020 09:18:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org DA37A389781D 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 B6C69AE87 for ; Tue, 12 May 2020 09:18:36 +0000 (UTC) Date: Tue, 12 May 2020 11:18:32 +0200 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [committed][gdb/testsuite] Fix duplicate test-names in gdb.multi Message-ID: <20200512091831.GA2302@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.2 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 09:18:36 -0000 Hi, In gdb.multi we have: ... DUPLICATE: gdb.multi/multi-term-settings.exp: \ inf1_how=run: inf2_how=run: info inferiors DUPLICATE: gdb.multi/multi-term-settings.exp: \ inf1_how=run: inf2_how=attach: info inferiors DUPLICATE: gdb.multi/multi-term-settings.exp: \ inf1_how=run: inf2_how=tty: info inferiors DUPLICATE: gdb.multi/multi-term-settings.exp: \ inf1_how=attach: inf2_how=run: info inferiors DUPLICATE: gdb.multi/multi-term-settings.exp: \ inf1_how=attach: inf2_how=attach: attach DUPLICATE: gdb.multi/multi-term-settings.exp: \ inf1_how=attach: inf2_how=attach: info inferiors DUPLICATE: gdb.multi/multi-term-settings.exp: \ inf1_how=attach: inf2_how=tty: info inferiors DUPLICATE: gdb.multi/multi-term-settings.exp: \ inf1_how=tty: inf2_how=run: info inferiors DUPLICATE: gdb.multi/multi-term-settings.exp: \ inf1_how=tty: inf2_how=attach: info inferiors DUPLICATE: gdb.multi/multi-term-settings.exp: \ inf1_how=tty: inf2_how=tty: tty TTY DUPLICATE: gdb.multi/multi-term-settings.exp: \ inf1_how=tty: inf2_how=tty: info inferiors ... Fix these using with_test_prefix. Tested on x86_64-linux. Committed to trunk. Thanks, - Tom [gdb/testsuite] Fix duplicate test-names in gdb.multi gdb/testsuite/ChangeLog: 2020-05-12 Tom de Vries * gdb.multi/multi-term-settings.exp: Use with_test_prefix. --- gdb/testsuite/gdb.multi/multi-term-settings.exp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/gdb.multi/multi-term-settings.exp b/gdb/testsuite/gdb.multi/multi-term-settings.exp index dafbb1e5f3..aa467e3b41 100644 --- a/gdb/testsuite/gdb.multi/multi-term-settings.exp +++ b/gdb/testsuite/gdb.multi/multi-term-settings.exp @@ -125,7 +125,9 @@ proc coretest {inf1_how inf2_how} { clean_restart $binfile - set inf1_spawn_id [create_inferior 1 $inf1_how] + with_test_prefix "inf1" { + set inf1_spawn_id [create_inferior 1 $inf1_how] + } set num 2 gdb_test "add-inferior" "Added inferior $num.*" \ @@ -134,7 +136,9 @@ proc coretest {inf1_how inf2_how} { "switch to inferior $num" gdb_file_cmd ${binfile} - set inf2_spawn_id [create_inferior 2 $inf2_how] + with_test_prefix "inf2" { + set inf2_spawn_id [create_inferior 2 $inf2_how] + } gdb_test_no_output "set schedule-multiple on" @@ -218,8 +222,10 @@ proc coretest {inf1_how inf2_how} { } # Useful for debugging in case the Ctrl-C above fails. - gdb_test "info inferiors" - gdb_test "info threads" + with_test_prefix "final" { + gdb_test "info inferiors" + gdb_test "info threads" + } } set how_modes {"run" "attach" "tty"}