From 53e981d986a7eb149de1de6491381a1cb049757c Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 13 Aug 2013 15:50:13 +0000 Subject: [PATCH] more uses of standard_output_file A few spots in lib make output files, either in "." or in $objdir/$subdir. This patch changes these spots to use standard_output_file. This help the parallelization project. * lib/gdb.exp (build_id_debug_filename_get): Use standard_output_file. * lib/prelink-support.exp (section_get) (build_executable_own_libs): Use standard_output_file. --- gdb/testsuite/ChangeLog | 7 +++++++ gdb/testsuite/lib/gdb.exp | 2 +- gdb/testsuite/lib/prelink-support.exp | 7 +++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 39c7685..5f67205 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2013-08-13 Tom Tromey + + * lib/gdb.exp (build_id_debug_filename_get): Use + standard_output_file. + * lib/prelink-support.exp (section_get) + (build_executable_own_libs): Use standard_output_file. + 2013-08-12 Tom Tromey * Makefile.in (ALL_SUBDIRS): Add gdb.go. diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 70b797e..b89c9cd 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3890,7 +3890,7 @@ proc gdb_skip_xml_test { } { # converted to the form: .build-id/ab/cdef1234...89.debug # Return "" if no build-id found. proc build_id_debug_filename_get { exec } { - set tmp "${exec}-tmp" + set tmp [standard_output_file "${exec}-tmp"] set objcopy_program [transform objcopy] set result [catch "exec $objcopy_program -j .note.gnu.build-id -O binary $exec $tmp" output] diff --git a/gdb/testsuite/lib/prelink-support.exp b/gdb/testsuite/lib/prelink-support.exp index fca7aa4c..e61811b 100644 --- a/gdb/testsuite/lib/prelink-support.exp +++ b/gdb/testsuite/lib/prelink-support.exp @@ -18,9 +18,8 @@ # for sections ".interp" or ".gnu_debuglink". proc section_get {exec section} { - global objdir global subdir - set tmp "${objdir}/${subdir}/section_get.tmp" + set tmp [standard_output_file section_get.tmp] set objcopy_program [transform objcopy] set command "exec $objcopy_program -O binary --set-section-flags $section=A --change-section-address $section=0 -j $section $exec $tmp" @@ -117,12 +116,12 @@ proc file_copy {src dest} { # with -Wl,-soname,NAME.so are not copied. proc build_executable_own_libs {testname executable sources options {interp ""} {dir ""}} { - global objdir subdir + global subdir if {[build_executable $testname $executable $sources $options] == -1} { return "" } - set binfile ${objdir}/${subdir}/${executable} + set binfile [standard_output_file ${executable}] set ldd [gdb_find_ldd] set command "$ldd $binfile" -- 2.7.4