Patchwork Use standard_output_file in a couple more places

login
register
mail settings
Submitter Tom Tromey
Date Sept. 28, 2018, 8:35 p.m.
Message ID <20180928203516.7897-1-tom@tromey.com>
Download mbox | patch
Permalink /patch/29576/
State New
Headers show

Comments

Tom Tromey - Sept. 28, 2018, 8:35 p.m.
I noticed a few files left over in the testsuite/ directory in the
build tree after running tests.  Normally output files should not wind
up there, but instead should end up in the test's subdirectory.  This
isn't always crucial, but in the past there were problems with tests
clashing, preventing parallel runs, and so it is better to be clean
here.

This patch changes a couple of tests to use standard_output_file to
fix this problem.

Tested by re-running the tests in question and examining the
directory.

gdb/testsuite/ChangeLog
2018-09-28  Tom Tromey  <tom@tromey.com>

	* gdb.base/gnu-ifunc.exp (build): Use standard_output_file.
	* gdb.trace/unavailable-dwarf-piece.exp: Use standard_output_file.
---
 gdb/testsuite/ChangeLog                             | 5 +++++
 gdb/testsuite/gdb.base/gnu-ifunc.exp                | 2 +-
 gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
Tom Tromey - Oct. 7, 2018, 4:47 a.m.
>>>>> "Tom" == Tom Tromey <tom@tromey.com> writes:

Tom> gdb/testsuite/ChangeLog
Tom> 2018-09-28  Tom Tromey  <tom@tromey.com>

Tom> 	* gdb.base/gnu-ifunc.exp (build): Use standard_output_file.
Tom> 	* gdb.trace/unavailable-dwarf-piece.exp: Use standard_output_file.

I'm checking this in now.

Tom

Patch

diff --git a/gdb/testsuite/gdb.base/gnu-ifunc.exp b/gdb/testsuite/gdb.base/gnu-ifunc.exp
index d6ec6988a7..8f122a0097 100644
--- a/gdb/testsuite/gdb.base/gnu-ifunc.exp
+++ b/gdb/testsuite/gdb.base/gnu-ifunc.exp
@@ -72,7 +72,7 @@  proc build {resolver_attr resolver_debug final_debug} {
 	lappend final_opts "debug"
     }
 
-    set final_o $final_file-$suffix.o
+    set final_o [standard_output_file $final_file-$suffix.o]
 
     if { [gdb_compile_shlib ${srcdir}/${subdir}/$libsrc \
 	      $lib_so $lib_opts] != ""
diff --git a/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp b/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp
index 9fd3a739a7..49bfba8a05 100644
--- a/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp
+++ b/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp
@@ -22,7 +22,7 @@  if {![dwarf2_support]} {
 
 standard_testfile .c
 
-set asm_file "${testfile}-dbg.s"
+set asm_file [standard_output_file "${testfile}-dbg.s"]
 set opts {}
 
 if  { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile}1.o \