Index: gdb/testsuite/gdb.base/twice.exp |
diff --git a/gdb/testsuite/gdb.base/twice.exp b/gdb/testsuite/gdb.base/twice.exp |
index 41f9bdc6b55a834114c5ba3cb672ef78a9a8ad74..9e7e33487b5b694b2c718be489f07d909cca2aa1 100644 |
--- a/gdb/testsuite/gdb.base/twice.exp |
+++ b/gdb/testsuite/gdb.base/twice.exp |
@@ -1,4 +1,4 @@ |
-# Copyright 1997, 1999, 2007-2012 Free Software Foundation, Inc. |
+# Copyright 1997-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,29 +14,25 @@ |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
-set testfile twice-tmp |
-set srcfile ${testfile}.c |
-set binfile ${objdir}/${subdir}/${testfile} |
+standard_testfile twice.c |
set options debug |
lappend options "additional_flags=-I." |
-set fileid [open ${objdir}/${subdir}/${srcfile} w]; |
-puts $fileid "#include \"twice.c\""; |
-close $fileid; |
+set local_srcfile [standard_output_file twice-tmp.c] |
+set fileid [open $local_srcfile w] |
+puts $fileid "#include \"twice.c\"" |
+close $fileid |
-remote_download host ${srcdir}/${subdir}/twice.c twice.c |
+gdb_remote_download host ${srcdir}/${subdir}/twice.c |
-if { [gdb_compile "${objdir}/${subdir}/${srcfile}" "${binfile}" executable $options] != "" } { |
+if { [gdb_compile $local_srcfile "${binfile}" executable $options] != "" } { |
untested twice.exp |
return -1 |
} |
# Start with a fresh gdb. |
-gdb_exit |
-gdb_start |
-gdb_reinitialize_dir $srcdir/$subdir |
-gdb_load $binfile |
+clean_restart $binfile |
if [runto_main] then { |
# Test that GDB can still detect whether we have line numbers |