From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id iLcqLLXehl//JwAAWB0awg (envelope-from ) for ; Wed, 14 Oct 2020 07:19:17 -0400 Received: by simark.ca (Postfix, from userid 112) id B2B581EF6F; Wed, 14 Oct 2020 07:19:17 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=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 175221E58E for ; Wed, 14 Oct 2020 07:19:17 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9157E3861862; Wed, 14 Oct 2020 11:19:16 +0000 (GMT) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id 99D993861812 for ; Wed, 14 Oct 2020 11:19:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 99D993861812 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.221.27]) by mx2.suse.de (Postfix) with ESMTP id AF1FDAC1D; Wed, 14 Oct 2020 11:19:13 +0000 (UTC) Date: Wed, 14 Oct 2020 13:19:11 +0200 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [committed][gdb/testsuite] Fix gdb.ada/mi_catch_ex{,_hand}.exp FAILs Message-ID: <20201014111909.GA1753@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-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: , Cc: Pedro Alves Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" Hi, The test-case gdb.ada/mi_catch_ex.exp tests two scenarios. The two scenarios are separated by: - a mi_run_to_main (before commit b75d55d4d2 "Eliminate mi_run_to_main, introduce mi_clean_restart") - a mi_runto_main (after that commit) The now removed mi_run_to_main contained a mi_delete_breakpoints, while mi_runto_main does not, which causes FAILs in the second scenario. Fix this by adding the missing mi_delete_breakpoints in the test-case, and likewise in gdb.ada/mi_catch_ex_hand.exp. Reg-tested on x86_64-linux. Committed to trunk. Thanks, - Tom [gdb/testsuite] Fix gdb.ada/mi_catch_ex{,_hand}.exp FAILs gdb/testsuite/ChangeLog: 2020-10-14 Tom de Vries PR testsuite/26732 * gdb.ada/mi_catch_ex.exp: Do mi_delete_breakpoints before running scenario 2. * gdb.ada/mi_catch_ex_hand.exp: Same. --- gdb/testsuite/gdb.ada/mi_catch_ex.exp | 1 + gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp | 1 + 2 files changed, 2 insertions(+) diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex.exp b/gdb/testsuite/gdb.ada/mi_catch_ex.exp index 103ec85f86..1d2625aa1a 100644 --- a/gdb/testsuite/gdb.ada/mi_catch_ex.exp +++ b/gdb/testsuite/gdb.ada/mi_catch_ex.exp @@ -123,6 +123,7 @@ continue_to_exception \ # - continue, the program exits. with_test_prefix "scenario 2" { + mi_delete_breakpoints if {[mi_runto_main] < 0} { fail "cannot run to main, testcase aborted" return 0 diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp b/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp index ef3dd24979..6e913c1031 100644 --- a/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp +++ b/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp @@ -116,6 +116,7 @@ continue_to_exception_handler \ # but exit instead. with_test_prefix "scenario 2" { + mi_delete_breakpoints if {[mi_runto_main] < 0} { fail "cannot run to main, testcase aborted" return 0