aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@imgtec.com>2016-09-21 12:55:25 +0100
committerMaciej W. Rozycki <macro@imgtec.com>2016-09-21 12:59:33 +0100
commit3d0ec882241884d0cabb27f8fee1262dbc7cf9e7 (patch)
tree7412583a20d28a6cc9a95fd3ec86b4fb1d7df1ab
parentfc6cda2ee85d2c2719db3b5ae3a1ae963f28416b (diff)
downloadfsf-binutils-gdb-3d0ec882241884d0cabb27f8fee1262dbc7cf9e7.zip
fsf-binutils-gdb-3d0ec882241884d0cabb27f8fee1262dbc7cf9e7.tar.gz
fsf-binutils-gdb-3d0ec882241884d0cabb27f8fee1262dbc7cf9e7.tar.bz2
MIPS/testsuite: mips16-thunks: Use `standard_output_file'
Correct a commit 2151ccc56c74 ("Always organize test artifacts in a directory hierarchy") regression causing: Running .../gdb/testsuite/gdb.arch/mips16-thunks.exp ... gdb compile failed, Assembler messages: Fatal error: can't create .../gdb/testsuite/gdb.arch/mips16-thunks-inmain.o: No such file or directory gdb compile failed, Assembler messages: Fatal error: can't create .../gdb/testsuite/gdb.arch/mips16-thunks-main.o: No such file or directory gdb compile failed, mips-mti-linux-gnu-gcc: error: .../gdb/testsuite/gdb.arch/mips16-thunks-inmain.o: No such file or directory mips-mti-linux-gnu-gcc: error: .../gdb/testsuite/gdb.arch/mips16-thunks-main.o: No such file or directory UNSUPPORTED: gdb.arch/mips16-thunks.exp: No MIPS16 support in the toolchain. by using `standard_output_file' to construct output file names throughout. gdb/testsuite/ * gdb.arch/mips16-thunks.exp: Use `standard_output_file' throughout.
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.arch/mips16-thunks.exp9
2 files changed, 9 insertions, 5 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 730eeb7..a41db8d 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-09-21 Maciej W. Rozycki <macro@imgtec.com>
+
+ * gdb.arch/mips16-thunks.exp: Use `standard_output_file'
+ throughout.
+
2016-09-16 Andreas Arnez <arnez@linux.vnet.ibm.com>
* lib/gdb.exp: No longer skip hardware breakpoint tests on s390.
diff --git a/gdb/testsuite/gdb.arch/mips16-thunks.exp b/gdb/testsuite/gdb.arch/mips16-thunks.exp
index d32f4cc..15ebad3 100644
--- a/gdb/testsuite/gdb.arch/mips16-thunks.exp
+++ b/gdb/testsuite/gdb.arch/mips16-thunks.exp
@@ -35,14 +35,13 @@ proc set_src_and_obj { filename { suffix "" } } {
upvar srcfile srcfile
upvar objfile objfile
global srcdir
- global objdir
global subdir
if ![string equal "$suffix" ""] then {
set suffix "-$suffix"
}
set srcfile ${srcdir}/${subdir}/${filename}.c
- set objfile ${objdir}/${subdir}/${filename}${suffix}.o
+ set objfile [standard_output_file ${filename}${suffix}.o]
}
# First check if a trivial MIPS16 program can be built and debugged. This
@@ -60,7 +59,7 @@ set options [list debug nowarnings additional_flags=-mips16]
lappend objfiles ${objfile}
gdb_compile ${srcfile} ${objfile} object ${options}
-set binfile ${objdir}/${subdir}/${testname}
+set binfile [standard_output_file ${testname}]
set options [list debug nowarnings]
if { [gdb_compile ${objfiles} ${binfile} executable ${options}] != "" } then {
unsupported "No MIPS16 support in the toolchain."
@@ -115,7 +114,7 @@ set options [list \
lappend objfiles ${objfile}
gdb_compile ${srcfile} ${objfile} object ${options}
-set binfile ${objdir}/${subdir}/${testname}
+set binfile [standard_output_file ${testname}]
set options [list debug nowarnings additional_flags=-fPIC]
if { [gdb_compile ${objfiles} ${binfile} executable ${options}] == "" } then {
clean_restart ${testname}
@@ -186,7 +185,7 @@ set options [list \
lappend objfiles ${objfile}
gdb_compile ${srcfile} ${objfile} object ${options}
-set binfile ${objdir}/${subdir}/${testname}
+set binfile [standard_output_file ${testname}]
set options [list debug nowarnings]
gdb_compile ${objfiles} ${binfile} executable ${options}
clean_restart ${testname}