[binutils-gdb] Fix more testcases with standard_output_file.

[Jan Kratochvil <jkratoch at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=c99dbb4246fedd500dbdd50514589fc7f95d80c0

commit c99dbb4246fedd500dbdd50514589fc7f95d80c0
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Feb 15 18:54:03 2016 +0100

    Fix more testcases with standard_output_file.
    
    Since
    	commit 2151ccc56c74b55a8f0debf0724a495368f92591
    	Author: Simon Marchi <simon.marchi@ericsson.com>
    	Date:   Mon Feb 8 14:02:36 2016 -0500
    	    Always organize test artifacts in a directory hierarchy
    these testfiles could not build.
    
    gdb/testsuite/ChangeLog
    2016-02-15  Jan Kratochvil  <jan.kratochvil@redhat.com>
    
    	* gdb.arch/i386-gnu-cfi.exp: Use standard_output_file.
    	* gdb.arch/i386-prologue.exp: Likewise.
    	* gdb.arch/i386-size.exp: Likewise.

Diff:
---
 gdb/testsuite/ChangeLog                  | 6 ++++++
 gdb/testsuite/gdb.arch/i386-gnu-cfi.exp  | 2 +-
 gdb/testsuite/gdb.arch/i386-prologue.exp | 2 +-
 gdb/testsuite/gdb.arch/i386-size.exp     | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d945411..9dc5085 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2016-02-15  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.arch/i386-gnu-cfi.exp: Use standard_output_file.
+	* gdb.arch/i386-prologue.exp: Likewise.
+	* gdb.arch/i386-size.exp: Likewise.
+
 2016-02-15  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* gdb.base/wrong_frame_bt_full.exp: Use standard_output_file to
diff --git a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
index 247b9ef..b569139 100644
--- a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
+++ b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
@@ -31,7 +31,7 @@ if { ![is_x86_like_target] } then {
 set testfile "i386-gnu-cfi"
 set srcfilec ${testfile}.c
 set srcfileasm ${testfile}-asm.S
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile [standard_output_file ${testfile}]
 
 # some targets have leading underscores on assembly symbols.
 set additional_flags [gdb_target_symbol_prefix_flags]
diff --git a/gdb/testsuite/gdb.arch/i386-prologue.exp b/gdb/testsuite/gdb.arch/i386-prologue.exp
index 00ccfe5..399c628 100644
--- a/gdb/testsuite/gdb.arch/i386-prologue.exp
+++ b/gdb/testsuite/gdb.arch/i386-prologue.exp
@@ -28,7 +28,7 @@ if { ![is_x86_like_target] } then {
 
 set testfile "i386-prologue"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile [standard_output_file ${testfile}]
 
 # some targets have leading underscores on assembly symbols.
 set additional_flags [gdb_target_symbol_prefix_flags]
diff --git a/gdb/testsuite/gdb.arch/i386-size.exp b/gdb/testsuite/gdb.arch/i386-size.exp
index 4d49950..61acf2f 100644
--- a/gdb/testsuite/gdb.arch/i386-size.exp
+++ b/gdb/testsuite/gdb.arch/i386-size.exp
@@ -27,7 +27,7 @@ if { ![is_x86_like_target] } then {
 
 set testfile "i386-size"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile [standard_output_file ${testfile}]
 
 # some targets have leading underscores on assembly symbols.
 set additional_flags [gdb_target_symbol_prefix_flags]