Index: gdb/testsuite/gdb.arch/amd64-tailcall-cxx.exp |
diff --git a/gdb/testsuite/gdb.arch/amd64-tailcall-ret.exp b/gdb/testsuite/gdb.arch/amd64-tailcall-cxx.exp |
similarity index 63% |
copy from gdb/testsuite/gdb.arch/amd64-tailcall-ret.exp |
copy to gdb/testsuite/gdb.arch/amd64-tailcall-cxx.exp |
index 8460893fa3d337e5fe726e0e3194d735a7e290c3..db2ab3cfaa81583847b367b61d7678b730a0e537 100644 |
--- a/gdb/testsuite/gdb.arch/amd64-tailcall-ret.exp |
+++ b/gdb/testsuite/gdb.arch/amd64-tailcall-cxx.exp |
@@ -1,4 +1,4 @@ |
-# Copyright (C) 2012 Free Software Foundation, Inc. |
+# Copyright (C) 2012-2013 Free Software Foundation, Inc. |
# |
# This program is free software; you can redistribute it and/or modify |
# it under the terms of the GNU General Public License as published by |
@@ -14,31 +14,23 @@ |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
set opts {} |
-standard_testfile .S |
+standard_testfile amd64-tailcall-cxx1.S amd64-tailcall-cxx2.S |
if [info exists COMPILE] { |
- # make check RUNTESTFLAGS="gdb.arch/amd64-tailcall-ret.exp COMPILE=1" |
- standard_testfile |
+ # make check RUNTESTFLAGS="gdb.arch/amd64-tailcall-cxx.exp COMPILE=1" |
+ standard_testfile amd64-tailcall-cxx1.cc amd64-tailcall-cxx2.cc |
lappend opts debug optimize=-O2 |
} elseif { ![istarget x86_64-*-* ] || ![is_lp64_target] } { |
verbose "Skipping ${testfile}." |
return |
} |
-if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $opts] } { |
+if { [prepare_for_testing ${testfile}.exp ${testfile} "${srcfile} ${srcfile2}" $opts] } { |
return -1 |
} |
-if ![runto_main] { |
+if ![runto g] { |
return -1 |
} |
-gdb_breakpoint "g" |
-gdb_continue_to_breakpoint "g" ".* v = 2;" |
- |
-gdb_test "return" { f \(\); /\* second \*/} "return" \ |
- {Make g return now\? \(y or n\) } "y" |
- |
-gdb_continue_to_breakpoint "g" ".* v = 2;" |
- |
-gdb_test "finish" " v = 3;" |
+gdb_test "bt" "\r\n#0 +g \\(x=x@entry=2\\) at \[^\r\n\]*\r\n#1 +0x\[0-9a-f\]+ in f \\(x=x@entry=1\\) at \[^\r\n\]*\r\n#2 +0x\[0-9a-f\]+ in main .*" |