From 621271c7819c3337e3eb5e48b7a7ee66573543da Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Wed, 25 Jan 2023 13:44:17 +0100 Subject: [PATCH] [gdb/testsuite] Allow nodebug srcfile in gdb.base/unwind-on-each-insn.exp Test-case gdb.base/unwind-on-each-insn.exp compiles $srcfile with debug info, and $srcfile2 without. Occasionally, I try both files with debug info: ... - $srcfile $debug_flags $srcfile2 $nodebug_flags]]} { + $srcfile $debug_flags $srcfile2 $debug_flags]]} { ... and both files without: ... - $srcfile $debug_flags $srcfile2 $nodebug_flags]]} { + $srcfile $nodebug_flags $srcfile2 $nodebug_flags]]} { ... In the latter case, I run into: ... FAIL: gdb.base/unwind-on-each-insn.exp: foo: instruction 1: bt 2 FAIL: gdb.base/unwind-on-each-insn.exp: foo: instruction 1: up ... due to a mismatch between the regexp and the different output due to using nodebug. Fix this by making the regexp less strict. Tested on x86_64-linux. --- gdb/testsuite/gdb.base/unwind-on-each-insn.exp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/gdb.base/unwind-on-each-insn.exp b/gdb/testsuite/gdb.base/unwind-on-each-insn.exp index a5e43c6228b..d6f90dde8c1 100644 --- a/gdb/testsuite/gdb.base/unwind-on-each-insn.exp +++ b/gdb/testsuite/gdb.base/unwind-on-each-insn.exp @@ -111,11 +111,11 @@ proc do_test { function step_cmd } { "check frame-id matches" # Check that the previous frame is 'main'. - gdb_test "bt 2" "\r\n#1\\s+\[^\r\n\]+ in main \\(\\) .*" + gdb_test "bt 2" "\r\n#1\\s+\[^\r\n\]+ in main \\(\\)( .*)?" # Move up the stack (to main). gdb_test "up" \ - "\r\n#1\\s+\[^\r\n\]+ in main \\(\\) .*" + "\r\n#1\\s+\[^\r\n\]+ in main \\(\\)( .*)?" # Check we can unwind the stack-pointer and the frame base # address correctly. -- 2.30.2