]> git.ipfire.org Git - thirdparty/binutils-gdb.git/commitdiff
[gdb/testsuite] Fix gdb.base/annota1.exp on arm-linux
authorTom de Vries <tdevries@suse.de>
Mon, 11 Nov 2024 15:02:57 +0000 (16:02 +0100)
committerTom de Vries <tdevries@suse.de>
Mon, 11 Nov 2024 15:02:57 +0000 (16:02 +0100)
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.

gdb/testsuite/gdb.base/annota1.exp

index f5a253b62f73f176294547e18892d069536acba2..0388c61ab93bb2178f56566f98d9d103f5777e56 100644 (file)
@@ -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" \