From 7470adbb872d5363580eb5e0a8dbb231c286ee4c Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Thu, 6 Oct 2016 15:12:54 +0100 Subject: [PATCH] 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. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/solib-disc.exp | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index b27ca79eb1..223964e0d0 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-10-06 Maciej W. Rozycki + + * gdb.base/solib-disc.exp: Use `standard_output_file' + throughout. + 2016-10-06 Pedro Alves * 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 66cf9609df..8b61c8315c 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}]