* lib/gdb.exp (standard_testfile): Don't declare objdir.

	(clean_restart): Likewise.
	(core_find): Use standard_output_file.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ed944313fac987b9653b08e71c615ac4056bb929..f9b6fa5821d6e18bb53b73bd4ebee067c471a4a3 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-12  Tom Tromey  <tromey@redhat.com>
+
+       * lib/gdb.exp (standard_testfile): Don't declare objdir.
+       (clean_restart): Likewise.
+       (core_find): Use standard_output_file.
+
 2012-07-12  Tom Tromey  <tromey@redhat.com>
 
        * gdb.dwarf2/dup-psym.exp: Use prepare_for_testing_full.

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index c36a8adea2930cf02cbd8b649c7e8e7b1968adc4..4f2b7c9376935a5f0ac78568fc7338ec7efe4bc9 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -3097,7 +3097,7 @@ proc standard_output_file {basename} {
 
 proc standard_testfile {args} {
     global gdb_test_file_name
-    global objdir subdir
+    global subdir
     global gdb_test_file_last_vars
 
     # Outputs.
@@ -3797,7 +3797,6 @@ proc build_executable { testname executable {sources ""} {options {debug}} } {
 # the basename of the binary.
 proc clean_restart { executable } {
     global srcdir
-    global objdir
     global subdir
     set binfile [standard_output_file ${executable}]
 
@@ -3987,7 +3986,7 @@ proc core_find {binfile {deletefiles {}} {arg ""}} {
     # could have many core files lying around, and it may be difficult to
     # tell which one is ours, so let's run the program in a subdirectory.
     set found 0
-    set coredir "${objdir}/${subdir}/coredir.[getpid]"
+    set coredir [standard_output_file coredir.[getpid]]
     file mkdir $coredir
     catch "system \"(cd ${coredir}; ulimit -c unlimited; ${binfile} ${arg}; true) >/dev/null 2>&1\""
     #      remote_exec host "${binfile}"