public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] gdb/testsuite: handle differences in guile error string output
@ 2023-02-13 11:23 Andrew Burgess
0 siblings, 0 replies; only message in thread
From: Andrew Burgess @ 2023-02-13 11:23 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=97c195191578e9a68bfbb810eea373f5f3efcb7d
commit 97c195191578e9a68bfbb810eea373f5f3efcb7d
Author: Andrew Burgess <aburgess@redhat.com>
Date: Mon Feb 13 11:19:57 2023 +0000
gdb/testsuite: handle differences in guile error string output
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.
Diff:
---
gdb/testsuite/gdb.ada/tasks.exp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gdb/testsuite/gdb.ada/tasks.exp b/gdb/testsuite/gdb.ada/tasks.exp
index a73a1919419..eb7ee5c9951 100644
--- a/gdb/testsuite/gdb.ada/tasks.exp
+++ b/gdb/testsuite/gdb.ada/tasks.exp
@@ -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"
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-02-13 11:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-13 11:23 [binutils-gdb] gdb/testsuite: handle differences in guile error string output Andrew Burgess
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).