fix multi-arch-exec for parallel mode

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.
This commit is contained in:
Tom Tromey
2013-11-13 10:01:25 -07:00
parent da0781dc5f
commit 08c430507d
3 changed files with 11 additions and 3 deletions

View File

@ -1,3 +1,8 @@
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.
2013-11-12 Doug Evans <dje@google.com> 2013-11-12 Doug Evans <dje@google.com>
* gdb.base/fileio.exp: Make $dir2 writable after the test is done * gdb.base/fileio.exp: Make $dir2 writable after the test is done

View File

@ -21,8 +21,8 @@
int int
main () main ()
{ {
execl ("gdb.multi/multi-arch-exec-hello", execl (BASEDIR "/multi-arch-exec-hello",
"gdb.multi/multi-arch-exec-hello", BASEDIR "/multi-arch-exec-hello",
(char *) NULL); (char *) NULL);
perror ("execl failed"); perror ("execl failed");
exit (1); exit (1);

View File

@ -49,8 +49,11 @@ if [istarget "s390*-*-*"] {
set march2 "-m32" set march2 "-m32"
} }
set dirname [relative_filename [pwd] [file dirname $binfile2]]
if { [prepare_for_testing ${testfile}.exp ${exec1} "${srcfile1}" \ 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 return -1
} }