aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/gdb.gdb/selftest.exp7
2 files changed, 12 insertions, 1 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d7721d5..5e99adf 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-22 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ Fix testsuite compatibility with Guile.
+ * gdb.gdb/selftest.exp (send ^C to child process): Accept also Thread.
+ (thread 1): New test for backtrace through signal handler.
+
2016-01-22 Yao Qi <yao.qi@linaro.org>
PR testsuite/19491
diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
index 4d55cb5..3d98a0c 100644
--- a/gdb/testsuite/gdb.gdb/selftest.exp
+++ b/gdb/testsuite/gdb.gdb/selftest.exp
@@ -436,8 +436,9 @@ proc test_with_self { executable } {
if ![target_info exists gdb,nointerrupts] {
set description "send ^C to child process"
send_gdb "\003"
+ # "Thread 1" is displayed iff Guile support is linked in.
gdb_expect {
- -re "Program received signal SIGINT.*$gdb_prompt $" {
+ -re "(Thread 1 .*|Program) received signal SIGINT.*$gdb_prompt $" {
pass "$description"
}
-re ".*$gdb_prompt $" {
@@ -453,6 +454,10 @@ proc test_with_self { executable } {
gdb_test "signal SIGINT" \
"Continuing with signal SIGINT.*" \
"$description"
+
+ # Switch back to the GDB thread if Guile support is linked in.
+ # "signal SIGINT" could also switch the current thread.
+ gdb_test "thread 1" {\[Switching to thread 1 .*\].*}
# get a stack trace
#