* gdb.base/step-bt.exp: Make hexadecimal address optional in

	expected output of the backtrace commands.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 73a0d8cae7eef43a0afc4d31d38f626830c855d5..0c4de89b13070d3caf05949e8aaaef5f232af47c 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-10  Joel Brobecker  <brobecker@adacore.com>
+           Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * gdb.base/step-bt.exp: Make hexadecimal address optional in
+       expected output of the backtrace commands.
+
 2006-08-09  Joel Brobecker  <brobecker@adacore.com>
 
        * gdb.arch/altivec-abi.exp: Replace gdb_suppress_entire_file with

diff --git a/gdb/testsuite/gdb.base/step-bt.exp b/gdb/testsuite/gdb.base/step-bt.exp
index f2cad9679647aeb9bfd0cb757db5a54080f787c9..63e223deb9bba80763e17fca626d0e66a1296b84 100644 (file)
--- a/gdb/testsuite/gdb.base/step-bt.exp
+++ b/gdb/testsuite/gdb.base/step-bt.exp
@@ -63,7 +63,7 @@ gdb_test "stepi" \
          "step first instruction"
 
 gdb_test "bt" \
-         "#0 +0x\[0-9a-z\]+ in hello .*#1 +0x\[0-9a-z\]* in main.*" \
+         "#0 +(0x\[0-9a-z\]+ in )?hello .*#1 +(0x\[0-9a-z\]* in )?main.*" \
          "backtrace after first instruction step"
 
 gdb_test "stepi" \
@@ -71,6 +71,6 @@ gdb_test "stepi" \
          "step second instruction"
 
 gdb_test "bt" \
-         "#0 +0x\[0-9a-z\]+ in hello .*#1 +0x\[0-9a-z\]* in main.*" \
+         "#0 +(0x\[0-9a-z\]+ in )?hello .*#1 +(0x\[0-9a-z\]* in )?main.*" \
          "backtrace after second instruction step"