diff options
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/annota1.exp | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 815bd58..224dc46 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2021-06-14 Pedro Alves <pedro@palves.net> + + * gdb.base/annota1.exp: Build list using [list] instead of {}. + Tell [join] to join with no character. Build expected pattern in + separate variable instead of in the -re expression directly. + 2021-06-11 Kevin Buettner <kevinb@redhat.com> * gdb.mi/mi-sym-info.exp (114-symbol-info-function test): Increase diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp index e2a9423..3689f49 100644 --- a/gdb/testsuite/gdb.base/annota1.exp +++ b/gdb/testsuite/gdb.base/annota1.exp @@ -126,8 +126,8 @@ gdb_test_multiple "info break" "breakpoint info" { # #exp_internal 1 set binexp [string_to_regexp $binfile] -gdb_test_multiple "run" "run until main breakpoint" { - -re [join { "\r\n\032\032post-prompt\r\nStarting program: $binexp " \ + +set run_re [join [list "\r\n\032\032post-prompt\r\nStarting program: $binexp " \ "\(\(\r\nReading \[^\r\n\]+\)|\(\r\nwarning: File transfers from remote targets can be slow\[^\r\n\]+\)\)*" \ "\(\r\nwarning: Skipping \[^\r\n\]+ .gdb_index section in \[^\r\n\]+\r\nDo \"set use-deprecated-index-sections on\" before the file is read\r\nto use the section anyway\\.\)?" \ "\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n" \ @@ -146,7 +146,10 @@ gdb_test_multiple "run" "run until main breakpoint" { "\032\032frame-source-end\r\n\r\n\r\n" \ "\032\032source.*$srcfile:$main_line:.*:beg:$hex\r\n\r\n" \ "\032\032frame-end\r\n\r\n" \ - "\032\032stopped.*$gdb_prompt$" } ] { + "\032\032stopped.*$gdb_prompt$" ] "" ] + +gdb_test_multiple "run" "run until main breakpoint" { + -re $run_re { pass $gdb_test_name } } |