From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id 67E50385842D for ; Sat, 29 Apr 2023 06:57:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 67E50385842D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 9FD091FD79 for ; Sat, 29 Apr 2023 06:57:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1682751424; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=XZmFRB2P6eHniF9yLmfaNWmipIbDdRd7iLn4NlHloME=; b=sIPMZxjDLRUqTVrFZWOzHrv8KrOTJjujo6phhSaUGbdxMU23BMSloPpQse8SFl8Itp4r0o cpYx6C4B3AIYL65m5voXwUQPq4QUYlm3XKotTQ/CIp6BpzTiYkXp8LmEe+SDd6YAof9LG6 KrtayUFUVhoWPQ2BoeFgZO4+Q/6ZvwI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1682751424; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=XZmFRB2P6eHniF9yLmfaNWmipIbDdRd7iLn4NlHloME=; b=3b/taYa8gH/2um06EMJLEDSC2sZ/f5m+fQqhQOXcBw1f+UFhNR2eLgeZeTAq2hC5z3HnzG QUEGOzg+nSE9dCDg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 8855A13587 for ; Sat, 29 Apr 2023 06:57:04 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 5CogIMC/TGTJUQAAMHmgww (envelope-from ) for ; Sat, 29 Apr 2023 06:57:04 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [pushed] [gdb/testsuite] Fix gdb.ada/excep_handle.exp for updated gdb_test Date: Sat, 29 Apr 2023 08:57:19 +0200 Message-Id: <20230429065719.9562-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Test-case gdb.ada/excep_handle.exp fails since commit e2f620135d9 ("gdb/testsuite: change newline patterns used in gdb_test"): ... (gdb) continue^M Continuing.^M ^M Catchpoint 2, exception at 0x00000000004020b6 in foo () at foo.adb:26^M 26 when Constraint_Error =>^M (gdb) FAIL: gdb.ada/excep_handle.exp: continuing to first Constraint_Error \ exception handlers ... The output is supposed to be matched by: ... gdb_test "continue" \ "Continuing\.$eol$catchpoint_constraint_error_msg$eol.*" \ "continuing to first Constraint_Error exception handlers" ... but the $eol bit no longer matches due to the stricter matching introduced in aforementioned commit. Fix this by dropping the "$eol.*" bit. Tested on x86_64-linux. PR testsuite/30399 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30399 --- gdb/testsuite/gdb.ada/excep_handle.exp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gdb/testsuite/gdb.ada/excep_handle.exp b/gdb/testsuite/gdb.ada/excep_handle.exp index f8a6ded2cdf..2cc80fbb988 100644 --- a/gdb/testsuite/gdb.ada/excep_handle.exp +++ b/gdb/testsuite/gdb.ada/excep_handle.exp @@ -69,8 +69,8 @@ gdb_test_multiple "catch handlers" $msg { # Continue. The program should stop at first exception handling. gdb_test "continue" \ - "Continuing\.$eol$catchpoint_constraint_error_msg$eol.*" \ - "continuing to first Constraint_Error exception handlers" + "Continuing\.$eol$catchpoint_constraint_error_msg" \ + "continuing to first Constraint_Error exception handlers" # Resume the program's exception. # @@ -80,8 +80,8 @@ gdb_test "continue" \ # the next exception being raised. gdb_test "continue" \ - "Continuing\.$eol$catchpoint_storage_error_msg$eol.*" \ - "continuing and stopping in Storage_Error exception handlers" + "Continuing\.$eol$catchpoint_storage_error_msg" \ + "continuing and stopping in Storage_Error exception handlers" gdb_test_no_output "delete 2" \ "delete catchpoint on all Ada exceptions handlers" @@ -99,8 +99,8 @@ gdb_test "catch handlers Program_Error" \ # Continue, we should not stop at ABORT_SIGNAL but at Program_Error one. gdb_test "continue" \ - "Continuing\.$eol$catchpoint_program_error_msg$eol.*" \ - "continuing without stopping to Program_Error exception handlers" + "Continuing\.$eol$catchpoint_program_error_msg" \ + "continuing without stopping to Program_Error exception handlers" gdb_test_no_output \ "delete 3" \ @@ -115,8 +115,8 @@ gdb_test "catch handlers Storage_Error" \ # Continue, we should stop at Storage_Error handlers. gdb_test "continue" \ - "Continuing\.$eol$catchpoint_storage_error_msg$eol.*" \ - "continuing without stopping to Storage_Error exception handlers" + "Continuing\.$eol$catchpoint_storage_error_msg" \ + "continuing without stopping to Storage_Error exception handlers" gdb_test_no_output \ "delete 4" \ @@ -140,8 +140,8 @@ gdb_test "info breakpoint" "stop only if Global_Var = 2" \ # Continue, we should not stop at ABORT_SIGNAL but at Program_Error one. gdb_test "continue" \ - "Continuing\.$eol$catchpoint_constraint_error_msg$eol.*" \ - "continuing to second Constraint_Error exception handlers" + "Continuing\.$eol$catchpoint_constraint_error_msg" \ + "continuing to second Constraint_Error exception handlers" gdb_test_no_output \ "delete 5" \ @@ -162,8 +162,8 @@ gdb_test "catch handlers Program_Error if Global_Var = 4" \ # the second one. gdb_test "continue" \ - "Continuing\.$eol$catchpoint_program_error_msg$eol.*" \ - "continuing to Program_Error exception handlers" + "Continuing\.$eol$catchpoint_program_error_msg" \ + "continuing to Program_Error exception handlers" # Continue, the program should exit properly. base-commit: e5cbbbf79ad269983f744414a7efece6784dd682 -- 2.35.3