From bc752bfbd98b6c2b02d59ed0a6c7ca88fbf4e3e0 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Sat, 29 Apr 2023 08:57:07 +0200 Subject: [PATCH] [gdb/testsuite] Fix gdb.ada/excep_handle.exp for updated gdb_test 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. -- 2.30.2