yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gdb/testsuite: handle differences in guile error string output

Browse Source 
A new guile test added in commit:

  commit 0a9ccb9dd79384f3ba3f8cd75940e8868f3b526f
  Date:   Mon Feb 6 13:04:16 2023 +0000

      gdb: only allow one of thread or task on breakpoints or watchpoints

fails for some versions of guile.  It turns out that some versions of
guile emit an error like this:

  (gdb) guile (set-breakpoint-thread! bp 1)
  ERROR: In procedure set-breakpoint-thread!:
  In procedure gdbscm_set_breakpoint_thread_x: cannot set both task and thread attributes
  Error while executing Scheme code.

while other versions of guile emit the error like this:

  (gdb) guile (set-breakpoint-thread! bp 1)
  ERROR: In procedure set-breakpoint-thread!:
  ERROR: In procedure gdbscm_set_breakpoint_thread_x: cannot set both task and thread attributes
  Error while executing Scheme code.

notice the extra 'ERROR: ' on the second line of output.  This commit
updates the test regexp to handle this optional 'ERROR: ' string.
This commit is contained in:
Andrew Burgess 2023-02-13 11:19:57 +00:00
parent 24b7e8b18a
commit 97c1951915
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/testsuite/gdb.ada/tasks.exp
View File

@ -127,7 +127,8 @@ if {[allow_guile_tests]} {
gdb_test "guile (set-breakpoint-thread! bp 1)" \
[multi_line \
"ERROR: In procedure set-breakpoint-thread!:" \
"In procedure gdbscm_set_breakpoint_thread_x: cannot set both task and thread attributes" \
"(ERROR: )?In procedure gdbscm_set_breakpoint_thread_x:\
cannot set both task and thread attributes" \
"Error while executing Scheme code."] \
"attempt to set thread, but expect an error"
@ -138,7 +139,8 @@ if {[allow_guile_tests]} {
gdb_test "guile (set-breakpoint-task! bp 1)" \
[multi_line \
"ERROR: In procedure set-breakpoint-task!:" \
"In procedure gdbscm_set_breakpoint_task_x: cannot set both task and thread attributes" \
"(ERROR: )?In procedure gdbscm_set_breakpoint_task_x:\
cannot set both task and thread attributes" \
"Error while executing Scheme code."] \
"attempt to set task, but expect an error"