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 6CFA03985C1E for ; Tue, 12 May 2020 09:06:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6CFA03985C1E 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 4333DAEF3 for ; Tue, 12 May 2020 09:06:06 +0000 (UTC) Date: Tue, 12 May 2020 11:06:01 +0200 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [committed][gdb/testsuite] Fix duplicate test-names in gdb.ada Message-ID: <20200512090600.GA32193@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:06:05 -0000 Hi, In gdb.ada we have these duplicate test-names: ... DUPLICATE: gdb.ada/catch_ex.exp: continuing to program completion DUPLICATE: gdb.ada/mi_catch_ex.exp: breakpoint at main DUPLICATE: gdb.ada/mi_catch_ex.exp: mi runto main DUPLICATE: gdb.ada/mi_catch_ex_hand.exp: breakpoint at main DUPLICATE: gdb.ada/mi_catch_ex_hand.exp: mi runto main ... Fix these using with_test_prefix. Tested on x86_64-linux. Committed to trunk. Thanks, - Tom [gdb/testsuite] Fix duplicate test-names in gdb.ada gdb/testsuite/ChangeLog: 2020-05-12 Tom de Vries * gdb.ada/catch_ex.exp: Use with_test_prefix. * gdb.ada/mi_catch_ex.exp: Same. * gdb.ada/mi_catch_ex_hand.exp: Same. --- gdb/testsuite/gdb.ada/catch_ex.exp | 9 +++++---- gdb/testsuite/gdb.ada/mi_catch_ex.exp | 16 ++++++++++------ gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp | 16 ++++++++++------ 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/gdb/testsuite/gdb.ada/catch_ex.exp b/gdb/testsuite/gdb.ada/catch_ex.exp index 5bdb63c8fc..7bb1c06f54 100644 --- a/gdb/testsuite/gdb.ada/catch_ex.exp +++ b/gdb/testsuite/gdb.ada/catch_ex.exp @@ -162,9 +162,10 @@ gdb_test "continue" \ "Continuing\.$eol$temp_catchpoint_msg$eol.*SPOT1" \ "continuing to temporary catchpoint" -gdb_test "continue" \ - "Continuing\..*$inferior_exited_re.*" \ - "continuing to program completion" - +with_test_prefix "temporary catchpoint" { + gdb_test "continue" \ + "Continuing\..*$inferior_exited_re.*" \ + "continuing to program completion" +} diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex.exp b/gdb/testsuite/gdb.ada/mi_catch_ex.exp index 60a5f6f19e..4b3e4f6f0b 100644 --- a/gdb/testsuite/gdb.ada/mi_catch_ex.exp +++ b/gdb/testsuite/gdb.ada/mi_catch_ex.exp @@ -69,9 +69,11 @@ mi_gdb_load ${binfile} # 1. Try catching all exceptions. # #################################### -if ![mi_run_to_main] then { - fail "cannot run to main, testcase aborted" - return 0 +with_test_prefix "scenario 1" { + if ![mi_run_to_main] then { + fail "cannot run to main, testcase aborted" + return 0 + } } mi_gdb_test "-catch-exception" \ @@ -125,9 +127,11 @@ continue_to_exception \ # - continue, we should see the unhandled Constrait_Error exception # - continue, the program exits. -if ![mi_run_to_main] then { - fail "cannot run to main, testcase aborted" - return 0 +with_test_prefix "scenario 2" { + if ![mi_run_to_main] then { + fail "cannot run to main, testcase aborted" + return 0 + } } mi_gdb_test "-catch-exception -e Program_Error" \ diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp b/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp index 159b22173a..59c8a10085 100644 --- a/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp +++ b/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp @@ -64,9 +64,11 @@ if [mi_gdb_start] { # 1. Try catching all exceptions handlers. # ############################################# -if ![mi_run_to_main] then { - fail "cannot run to main, testcase aborted" - return 0 +with_test_prefix "scenario 1" { + if ![mi_run_to_main] then { + fail "cannot run to main, testcase aborted" + return 0 + } } mi_gdb_test "-catch-handlers" \ @@ -114,9 +116,11 @@ continue_to_exception_handler \ # - continue, we should not stop at the Program_Error exception handler # but exit instead. -if ![mi_run_to_main] then { - fail "cannot run to main, testcase aborted" - return 0 +with_test_prefix "scenario 2" { + if ![mi_run_to_main] then { + fail "cannot run to main, testcase aborted" + return 0 + } } mi_gdb_test "-catch-handlers -e Constraint_Error" \