Index: gdb/testsuite/gdb.base/gdb1555.exp |
diff --git a/gdb/testsuite/gdb.base/gdb1555.exp b/gdb/testsuite/gdb.base/gdb1555.exp |
index 151a95d931bdbee4bcf91c95f9aadd6f50d3d1be..32a7ab8888e2fc295ab98aff35f945c9dbcd6f16 100644 |
--- a/gdb/testsuite/gdb.base/gdb1555.exp |
+++ b/gdb/testsuite/gdb.base/gdb1555.exp |
@@ -1,4 +1,4 @@ |
-# Copyright 2004, 2007-2012 Free Software Foundation, Inc. |
+# Copyright 2004-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 |
@@ -21,13 +21,11 @@ if {[skip_shlib_tests]} { |
return 0 |
} |
-set testfile gdb1555-main |
-set libfile gdb1555 |
-set srcfile ${testfile}.c |
-set binfile ${objdir}/${subdir}/${testfile} |
+standard_testfile gdb1555-main.c gdb1555.c |
+set libfile gdb1555 |
set libsrc "${srcdir}/${subdir}/${libfile}.c" |
-set libobj "${objdir}/${subdir}/${libfile}.so" |
+set libobj [standard_output_file ${libfile}.so] |
set execsrc "${srcdir}/${subdir}/${srcfile}" |
remote_exec build "rm -f ${binfile}" |
@@ -43,10 +41,7 @@ if { [gdb_compile_shlib $libsrc $libobj {debug}] != "" |
return -1 |
} |
-gdb_exit |
-gdb_start |
-gdb_reinitialize_dir $srcdir/$subdir |
-gdb_load ${binfile} |
+clean_restart ${binfile} |
gdb_load_shlibs $libobj |
if ![runto_main] then { |