diff options
| author | Tom de Vries <tdevries@suse.de> | 2021-09-21 00:54:08 +0200 |
|---|---|---|
| committer | Tom de Vries <tdevries@suse.de> | 2021-09-21 00:54:08 +0200 |
| commit | 5936ac73edd7d196611a9690a9a99f7137479e79 (patch) | |
| tree | 5eae627fef10eea8b05489d7c68cbcda34b136de | |
| parent | acb7bdf0d2235291adba1049a099729255571f2b (diff) | |
| download | binutils-5936ac73edd7d196611a9690a9a99f7137479e79.zip binutils-5936ac73edd7d196611a9690a9a99f7137479e79.tar.gz binutils-5936ac73edd7d196611a9690a9a99f7137479e79.tar.bz2 | |
[gdb/testsuite] Fix gdb.ada/interface.exp with gcc-9
When running test-case gdb.ada/interface.exp with gcc-9, we run into:
...
(gdb) info locals^M
s = (x => 1, y => 2, w => 3, h => 4)^M
r = (x => 1, y => 2, w => 3, h => 4)^M
(gdb) FAIL: gdb.ada/interface.exp: info locals
...
The failure is caused by the regexp expecting variable r followed by
variable s.
Fix this by allowing variable s followed by variable r as well.
Tested on x86_64-linux.
| -rw-r--r-- | gdb/testsuite/gdb.ada/interface.exp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gdb/testsuite/gdb.ada/interface.exp b/gdb/testsuite/gdb.ada/interface.exp index 2dfcd8e..9795699 100644 --- a/gdb/testsuite/gdb.ada/interface.exp +++ b/gdb/testsuite/gdb.ada/interface.exp @@ -34,9 +34,9 @@ gdb_test "print r" \ gdb_test "print s" \ "= \\(x => 1, y => 2, w => 3, h => 4\\)" +set r_re "r = \[^\r\n\]*" +set s_re "s = \[^\r\n\]*" set cmd "info locals" -gdb_test $cmd \ - [multi_line \ - $cmd \ - "r = \[^\r\n\]*" \ - "s = \[^\r\n\]*"] +set re1 [multi_line $cmd $r_re $s_re] +set re2 [multi_line $cmd $s_re $r_re] +gdb_test $cmd "(?:$re1|$re2)" |