Index: gdb/testsuite/gdb.cp/call-c.exp |
diff --git a/gdb/testsuite/gdb.cp/call-c.exp b/gdb/testsuite/gdb.cp/call-c.exp |
index c0fc79db27d7e45a7f05db0cb18850744bae5f86..68ca35db49bdc16a8874050545c278daa28e675f 100644 |
--- a/gdb/testsuite/gdb.cp/call-c.exp |
+++ b/gdb/testsuite/gdb.cp/call-c.exp |
@@ -13,31 +13,21 @@ |
# You should have received a copy of the GNU General Public License |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
-if $tracelevel then { |
- strace $tracelevel |
-} |
- |
if { [skip_cplus_tests] } { continue } |
-set testfile call-c |
-set binfile ${objdir}/${subdir}/${testfile} |
-set srcfilec ${srcdir}/${subdir}/${testfile}-1.c |
-set srcfilecpp ${srcdir}/${subdir}/${testfile}.cc |
-set objfilec ${objdir}/${subdir}/${testfile}-1.o |
-set objfilecpp ${objdir}/${subdir}/${testfile}.o |
+standard_testfile .cc call-c-1.c |
+set objfilec [standard_output_file ${testfile}-1.o] |
+set objfilecpp [standard_output_file ${testfile}.o] |
-if {[gdb_compile "${srcfilec}" "${objfilec}" object {debug}] != "" |
- || [gdb_compile "${srcfilecpp}" "${objfilecpp}" object {c++ debug}] != "" |
+if {[gdb_compile "$srcdir/$subdir/${srcfile2}" "${objfilec}" object {debug}] != "" |
+ || [gdb_compile "$srcdir/$subdir/${srcfile}" "${objfilecpp}" object {c++ debug}] != "" |
|| [gdb_compile "${objfilecpp} ${objfilec}" "${binfile}" executable {c++ debug}] != ""} { |
untested ${testfile}.exp |
return -1 |
} |
-gdb_exit |
-gdb_start |
-gdb_reinitialize_dir $srcdir/$subdir |
-gdb_load ${binfile} |
+clean_restart ${binfile} |
runto_main |