aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Evans <xdje42@gmail.com>2014-09-08 22:19:32 -0700
committerDoug Evans <xdje42@gmail.com>2014-09-08 22:19:32 -0700
commit837405970476d31d6b4d7774e2c914fdfa7a9930 (patch)
tree487088c93097018bb562e2bc68a94f1f4d406824
parentd81412aa4b2669d108de0b4e1d8f881cedebd8a9 (diff)
downloadgdb-837405970476d31d6b4d7774e2c914fdfa7a9930.zip
gdb-837405970476d31d6b4d7774e2c914fdfa7a9930.tar.gz
gdb-837405970476d31d6b4d7774e2c914fdfa7a9930.tar.bz2
gdb.guile/scm-error.exp: Handle guile 2.2 backtrace output.
gdb/testsuite/ChangeLog: * gdb.guile/scm-error.exp: Handle guile 2.2 backtrace output.
-rw-r--r--gdb/testsuite/ChangeLog4
-rw-r--r--gdb/testsuite/gdb.guile/scm-error.exp2
2 files changed, 5 insertions, 1 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d3d78d7..d5ebf48 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2014-09-09 Doug Evans <xdje42@gmail.com>
+
+ * gdb.guile/scm-error.exp: Handle guile 2.2 backtrace output.
+
2014-09-09 Yao Qi <yao@codesourcery.com>
* gdb.mi/mi-var-display.exp: Set print symbol off.
diff --git a/gdb/testsuite/gdb.guile/scm-error.exp b/gdb/testsuite/gdb.guile/scm-error.exp
index b5a1028..3de3dc2 100644
--- a/gdb/testsuite/gdb.guile/scm-error.exp
+++ b/gdb/testsuite/gdb.guile/scm-error.exp
@@ -95,7 +95,7 @@ gdb_test_no_output "set guile print-stack full" \
"set print-stack to full, for backtrace test"
gdb_test "guile (define x (top-func 42))" \
- "Guile Backtrace:.*top-func 42.*middle-func 42.*bottom-func 42.*" \
+ "Guile Backtrace:.*top-func (42|_).*middle-func (42|_).*bottom-func (42|_).*" \
"backtrace printed"
# Verify gdb-specific errors are printed properly.