summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@imgtec.com>2016-10-06 15:12:54 +0100
committerMaciej W. Rozycki <macro@imgtec.com>2016-10-06 15:15:54 +0100
commit7470adbb872d5363580eb5e0a8dbb231c286ee4c (patch)
tree3872c02f2d7114d06e04abbc0e39034d1d45c5c2
parent249471c08ad2ba2c325d691753b327a108138c89 (diff)
downloadbinutils-gdb-7470adbb872d5363580eb5e0a8dbb231c286ee4c.tar.gz
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.
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.base/solib-disc.exp4
2 files changed, 7 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b27ca79eb19..223964e0d01 100644
--- 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 66cf9609dff..8b61c8315c5 100644
--- 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}]