[PATCH] fix multi-arch-exec for parallel mode

[PATCH] fix multi-arch-exec for parallel mode

[Tom Tromey]

I noticed today that multi-arch-exec.exp was failing in parallel mode.

The bug is that multi-arch-exec.c assumes the non-parallel directory
layout.

This patch fixes the problem using the same "BASEDIR" approach used in
other tests.

Tested both ways on x86-64 Fedora 18.
I'm checking this in.

2013-11-13  Tom Tromey  <tromey@redhat.com>

	* gdb.multi/multi-arch-exec.exp: Define BASEDIR when compiling.
	* gdb.multi/multi-arch-exec.c (main): Use BASEDIR.
---
 gdb/testsuite/ChangeLog                     | 5 +++++
 gdb/testsuite/gdb.multi/multi-arch-exec.c   | 4 ++--
 gdb/testsuite/gdb.multi/multi-arch-exec.exp | 5 ++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/gdb/testsuite/gdb.multi/multi-arch-exec.c b/gdb/testsuite/gdb.multi/multi-arch-exec.c
index b32782c..8dcd230 100644
--- a/gdb/testsuite/gdb.multi/multi-arch-exec.c
+++ b/gdb/testsuite/gdb.multi/multi-arch-exec.c
@@ -21,8 +21,8 @@
 int
 main ()
 {
-  execl ("gdb.multi/multi-arch-exec-hello",
-         "gdb.multi/multi-arch-exec-hello",
+  execl (BASEDIR "/multi-arch-exec-hello",
+         BASEDIR "/multi-arch-exec-hello",
          (char *) NULL);
   perror ("execl failed");
   exit (1);
diff --git a/gdb/testsuite/gdb.multi/multi-arch-exec.exp b/gdb/testsuite/gdb.multi/multi-arch-exec.exp
index bd777a7..de84c36 100644
--- a/gdb/testsuite/gdb.multi/multi-arch-exec.exp
+++ b/gdb/testsuite/gdb.multi/multi-arch-exec.exp
@@ -49,8 +49,11 @@ if [istarget "s390*-*-*"] {
     set march2 "-m32"
 }
 
+set dirname [relative_filename [pwd] [file dirname $binfile2]]
 if { [prepare_for_testing ${testfile}.exp ${exec1} "${srcfile1}" \
-	  [list debug nowarnings additional_flags=${march1}]] } {
+	  [list debug nowarnings \
+	       additional_flags=${march1} \
+	       additional_flags=-DBASEDIR=\"$dirname\"]] } {
     return -1
 }
 
-- 
1.8.1.4