aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom de Vries <tdevries@suse.de>2024-11-11 16:02:57 +0100
committerTom de Vries <tdevries@suse.de>2024-11-11 16:02:57 +0100
commitc9353fa6e7b2642a8ab9dd9f0a8a025c15c759c2 (patch)
treef0cbc13bd13699f000e2e87dd6b822df0a51b47e
parent89e99b67475dce388846e12819a3bb70ba6ab06f (diff)
downloadbinutils-c9353fa6e7b2642a8ab9dd9f0a8a025c15c759c2.zip
binutils-c9353fa6e7b2642a8ab9dd9f0a8a025c15c759c2.tar.gz
binutils-c9353fa6e7b2642a8ab9dd9f0a8a025c15c759c2.tar.bz2
[gdb/testsuite] Fix gdb.base/annota1.exp on arm-linux
On arm-linux, gdb.base/annota1.exp fails: ... PASS: gdb.base/annota1.exp: breakpoint info run^M ^M ^Z^Zpost-prompt^M Starting program: /home/linux/gdb/build/gdb/testsuite/outputs/gdb.base/annota1/annota1 ^M ^M ^Z^Zbreakpoints-invalid^M ^M ^Z^Zframes-invalid^M ^M ^Z^Zstarting^M ^M ^Z^Zframes-invalid^M [Thread debugging using libthread_db enabled]^M Using host libthread_db library "/lib/arm-linux-gnueabihf/libthread_db.so.1".^M ^M ^Z^Zbreakpoints-invalid^M ^M ^Z^Zbreakpoint 1^M ^M Breakpoint 1, ^M ^Z^Zframe-begin 0 0x40054a^M ^M ^Z^Zframe-function-name^M main^M ^Z^Zframe-args^M ()^M ^Z^Zframe-source-begin^M at ^M ^Z^Zframe-source-file^M /home/linux/gdb/src/gdb/testsuite/gdb.base/annota1.c^M ^Z^Zframe-source-file-end^M :^M ^Z^Zframe-source-line^M 15^M ^Z^Zframe-source-end^M ^M ^M ^Z^Zsource /home/linux/gdb/binutils-gdb.git/gdb/testsuite/gdb.base/annota1.c:15:103:beg:0x40054a^M ^M ^Z^Zframe-end^M ^M ^Z^Zstopped^M ^M ^Z^Zpre-prompt^M (gdb) ^M ^Z^Zprompt^M FAIL: gdb.base/annota1.exp: run until main breakpoint (timeout) ... because the regexp doesn't match the first frames-invalid annotation. Fix this by adding an optional frames-invalid annotation in the regexp. Tested on arm-linux and x86_64-linux.
-rw-r--r--gdb/testsuite/gdb.base/annota1.exp2
1 files changed, 2 insertions, 0 deletions
diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp
index f5a253b..0388c61 100644
--- a/gdb/testsuite/gdb.base/annota1.exp
+++ b/gdb/testsuite/gdb.base/annota1.exp
@@ -159,6 +159,8 @@ set run_re \
$optional_re \
"\(\r\n\032\032breakpoints-invalid\r\n\)?" \
$optional_re \
+ "(\r\n\032\032frames-invalid\r\n)?" \
+ $optional_re \
"\r\n\032\032starting\r\n" \
$optional_re \
"\r\n\032\032frames-invalid\r\n" \