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.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d3d78d79ae7a8e58ddef705dd3ce7bcc98ed2f82..d5ebf48f059527250e7b1bd0826a5a45c48701ca 100644 (file)
--- 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 b5a1028d38342619b07602cf51e328cdc1dc5ded..3de3dc25af1c509749e3dd6e93c5d6551d1991fe 100644 (file)
--- 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.