testsuite: solib-disc: Use `standard_output_file'

Correct a commit 2151ccc56c74 ("Always organize test artifacts in a
directory hierarchy") regression causing:

Running .../gdb/testsuite/gdb.base/solib-disc.exp ...
gdb compile failed, Assembler messages:
Fatal error: can't create .../gdb/testsuite/gdb.base/so-disc-shr.c.o: No such file or directory

by using `standard_output_file' to construct output file names
throughout.

	gdb/testsuite/
	* gdb.base/solib-disc.exp: Use `standard_output_file'
	throughout.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b27ca79eb19bb4370b45044aa464d2b4b5ab7d87..223964e0d012b1d44a8cc144763f45529e22c6f3 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-10-06  Maciej W. Rozycki  <macro@imgtec.com>
+
+       * gdb.base/solib-disc.exp: Use `standard_output_file'
+       throughout.
+
 2016-10-06  Pedro Alves  <palves@redhat.com>
 
        * gdb.base/jit-simple-dl.c: New file.

diff --git a/gdb/testsuite/gdb.base/solib-disc.exp b/gdb/testsuite/gdb.base/solib-disc.exp
index 66cf9609dff2201672fbc3893a00eb0bf949e606..8b61c8315c50a20ff36a7c361b2efd29c40fea31 100644 (file)
--- a/gdb/testsuite/gdb.base/solib-disc.exp
+++ b/gdb/testsuite/gdb.base/solib-disc.exp
@@ -27,11 +27,11 @@ if { [info proc gdb_reconnect] == "" } {
 set testfile solib-disc
 set libfile so-disc-shr
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile [standard_output_file ${testfile}]
 
 set libsrc "${srcdir}/${subdir}/${libfile}.c"
 set libname "${libfile}.so"
-set libobj "${objdir}/${subdir}/${libname}"
+set libobj [standard_output_file ${libname}]
 set execsrc "${srcdir}/${subdir}/${srcfile}"
 set lib_dlopen [shlib_target_file ${libname}]
 set lib_syms [shlib_symbol_file ${libname}]