S390: Fix output path for s390-multiarch test case

Since test artifacts are organized in a directory hierarchy, the
s390-multiarch test case is not executed correctly any more.  This is
because it uses an obsolete way of constructing the output paths.

This fix invokes standard_testfile instead.

gdb/testsuite/ChangeLog:

	* gdb.arch/s390-multiarch.exp: Use standard_testfile instead of
	maintaining separate logic for constructing the output path.

2 files changed, 9 insertions, 5 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 62413b7..5c50aa4 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-17  Andreas Arnez  <arnez@linux.vnet.ibm.com>
+
+	* gdb.arch/s390-multiarch.exp: Use standard_testfile instead of
+	maintaining separate logic for constructing the output path.
+
 2016-03-16  Don Breazeal  <donb@codesourcery.com>
 
 	* gdb.threads/forking-threads-plus-breakpoint.c (thread_forks):
diff --git a/gdb/testsuite/gdb.arch/s390-multiarch.exp b/gdb/testsuite/gdb.arch/s390-multiarch.exp
index 00b3589..3bed279 100644
--- a/gdb/testsuite/gdb.arch/s390-multiarch.exp
+++ b/gdb/testsuite/gdb.arch/s390-multiarch.exp
@@ -28,9 +28,8 @@ if { ![isnative] || ![istarget s390x-*-* ] } {
     return
 }
 
-set testfile "s390-multiarch"
-set srcfile "${srcdir}/${subdir}/${testfile}.c"
-set binprefix "${objdir}/${subdir}/${testfile}"
+standard_testfile
+set binprefix $binfile
 
 gdb_exit
 
@@ -39,13 +38,13 @@ if { [get_compiler_info] } {
 }
 
 proc compile_and_dump {variant ccopts binfile} {
-    global srcfile
+    global srcdir subdir srcfile
     set compile_flags {debug}
     foreach opt $ccopts {
 	lappend compile_flags "additional_flags=$opt"
     }
     set test "compile ($variant)"
-    if { [gdb_compile $srcfile $binfile executable $compile_flags] != "" } {
+    if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "$binfile" executable $compile_flags] != "" } {
 	fail $test
 	return {}
     }