fix some "exec" tests

A few tests run an inferior that execs some other program.  The name
of this exec'd program is compiled in.  These tests assume the current
test suite directory layout, but fail in parallel mode.

This patch fixes these tests by letting the .exp files pass in the
directory names at compile time.

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

	* gdb.base/foll-exec.c (main): Use BASEDIR.
	* gdb.base/foll-exec.exp: Define BASEDIR during compilation.
	* gdb.base/foll-vfork.c (main): Use BASEDIR.
	* gdb.base/foll-vfork.exp: Define BASEDIR during compilation.
	* gdb.multi/bkpt-multi-exec.c (main): Use BASEDIR.
	* gdb.multi/bkpt-multi-exec.exp: Define BASEDIR during compilation.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f60e65703f9d6fe958be1c74fc5723f9cc5ca696..0c33d0e05f6c4d3bb634c53eba53b94b148d985f 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2013-11-04  Tom Tromey  <tromey@redhat.com>
+
+       * gdb.base/foll-exec.c (main): Use BASEDIR.
+       * gdb.base/foll-exec.exp: Define BASEDIR during compilation.
+       * gdb.base/foll-vfork.c (main): Use BASEDIR.
+       * gdb.base/foll-vfork.exp: Define BASEDIR during compilation.
+       * gdb.multi/bkpt-multi-exec.c (main): Use BASEDIR.
+       * gdb.multi/bkpt-multi-exec.exp: Define BASEDIR during compilation.
+
 2013-11-04  Tom Tromey  <tromey@redhat.com>
 
        * gdb.base/argv0-symlink.exp: Compute executable's directory

diff --git a/gdb/testsuite/gdb.base/foll-exec.c b/gdb/testsuite/gdb.base/foll-exec.c
index 1b760903dd70a2e9b22103a131bd9439815c8d49..78c1cda888a376863a9eff3e2de6e6a8c883a0e4 100644 (file)
--- a/gdb/testsuite/gdb.base/foll-exec.c
+++ b/gdb/testsuite/gdb.base/foll-exec.c
@@ -17,27 +17,27 @@ main ()
 
   printf ("foll-exec is about to execlp(execd-prog)...\n");
 
-  execlp ("gdb.base/execd-prog",
-          "gdb.base/execd-prog",
+  execlp (BASEDIR "/execd-prog",
+          BASEDIR "/execd-prog",
           "execlp arg1 from foll-exec",
           (char *)0);
 
   printf ("foll-exec is about to execl(execd-prog)...\n");
 
-  execl ("gdb.base/execd-prog",
-         "gdb.base/execd-prog",
+  execl (BASEDIR "/execd-prog",
+         BASEDIR "/execd-prog",
          "execl arg1 from foll-exec",
          "execl arg2 from foll-exec",
          (char *)0);
 
   {
     static char * argv[] = {
-      (char *)"gdb.base/execd-prog",
+      (char *)BASEDIR "/execd-prog",
       (char *)"execv arg1 from foll-exec",
       (char *)0};
 
     printf ("foll-exec is about to execv(execd-prog)...\n");
 
-    execv ("gdb.base/execd-prog", argv);
+    execv (BASEDIR "/execd-prog", argv);
   }
 }

diff --git a/gdb/testsuite/gdb.base/foll-exec.exp b/gdb/testsuite/gdb.base/foll-exec.exp
index 9456f429127d55e036137b5c9cbdfc0b94de48eb..135cad6c59b3cd4afe1a18936e672b260ad24a65 100644 (file)
--- a/gdb/testsuite/gdb.base/foll-exec.exp
+++ b/gdb/testsuite/gdb.base/foll-exec.exp
@@ -29,13 +29,17 @@ set testfile2 "execd-prog"
 set srcfile2 ${testfile2}.c
 set binfile2 [standard_output_file ${testfile2}]
 
+set compile_options debug
+set dirname [relative_filename [pwd] [file dirname $binfile]]
+lappend compile_options "additional_flags=-DBASEDIR=\"$dirname\""
+
 # build the first test case
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } {
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable $compile_options] != "" } {
      untested foll-exec.exp
      return -1
 }
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $compile_options] != "" } {
      untested foll-exec.exp
      return -1
 }

diff --git a/gdb/testsuite/gdb.base/foll-vfork.c b/gdb/testsuite/gdb.base/foll-vfork.c
index 694843f38f36a4aaa82cde51fc8896132ab83f92..d7d72fd183da9e6ca23767e940d4a0335cea5ad9 100644 (file)
--- a/gdb/testsuite/gdb.base/foll-vfork.c
+++ b/gdb/testsuite/gdb.base/foll-vfork.c
@@ -29,7 +29,7 @@ main ()
   pid = vfork ();
   if (pid == 0) {
     printf ("I'm the child!\n");
-    execlp ("gdb.base/vforked-prog", "gdb.base/vforked-prog", (char *)0);
+    execlp (BASEDIR "/vforked-prog", BASEDIR "/vforked-prog", (char *)0);
     perror ("exec failed");
     _exit (1);
   }

diff --git a/gdb/testsuite/gdb.base/foll-vfork.exp b/gdb/testsuite/gdb.base/foll-vfork.exp
index 06600603b96fd09c23ff1df6324ab7fe0e1d20f0..29d6da01aaa51037e5bce49545a5d129b84b01c3 100644 (file)
--- a/gdb/testsuite/gdb.base/foll-vfork.exp
+++ b/gdb/testsuite/gdb.base/foll-vfork.exp
@@ -47,7 +47,11 @@ if [istarget "hppa*-hp-hpux10.20"] then {
 
 standard_testfile
 
-if {[build_executable $testfile.exp $testfile $srcfile {debug}] == -1} {
+set compile_options debug
+set dirname [relative_filename [pwd] [file dirname $binfile]]
+lappend compile_options "additional_flags=-DBASEDIR=\"$dirname\""
+
+if {[build_executable $testfile.exp $testfile $srcfile $compile_options] == -1} {
     untested "failed to compile $testfile"
     return -1
 }
@@ -55,7 +59,7 @@ if {[build_executable $testfile.exp $testfile $srcfile {debug}] == -1} {
 set testfile2 "vforked-prog"
 set srcfile2 ${testfile2}.c
 
-if {[build_executable $testfile.exp $testfile2 $srcfile2 {debug}] == -1} {
+if {[build_executable $testfile.exp $testfile2 $srcfile2 $compile_options] == -1} {
     untested "failed to compile $testfile2"
     return -1
 }

diff --git a/gdb/testsuite/gdb.multi/bkpt-multi-exec.c b/gdb/testsuite/gdb.multi/bkpt-multi-exec.c
index 672d63b453ef3719ddd185678ee30fb4d9ce25b5..94c96688d1bbbede56c47e273533bc34ca8617db 100644 (file)
--- a/gdb/testsuite/gdb.multi/bkpt-multi-exec.c
+++ b/gdb/testsuite/gdb.multi/bkpt-multi-exec.c
@@ -7,7 +7,7 @@ int main (void)
 {
   printf ("foll-exec is about to execl(crashme)...\n");
 
-  execl ("gdb.multi/crashme",
-         "gdb.multi/crashme",
+  execl (BASEDIR "/crashme",
+         BASEDIR "/crashme",
          (char *)0);
 }

diff --git a/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp b/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp
index cf74701ac0fa0395b2bf5bb82b2b32baaa3a3b7b..c4eee8fae78cdee9f0d542d5b66cec2e8a0d375c 100644 (file)
--- a/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp
+++ b/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp
@@ -33,11 +33,15 @@ set exec2 "crashme"
 set srcfile2 ${exec2}.c
 set binfile2 [standard_output_file ${exec2}]
 
-if { [build_executable ${testfile}.exp ${exec1} "${srcfile1}" {debug nowarnings}] == -1 } {
+set compile_options {debug nowarnings}
+set dirname [relative_filename [pwd] [file dirname $binfile1]]
+lappend compile_options "additional_flags=-DBASEDIR=\"$dirname\""
+
+if { [build_executable ${testfile}.exp ${exec1} "${srcfile1}" $compile_options] == -1 } {
     return -1
 }
 
-if { [build_executable ${testfile}.exp ${exec2} "${srcfile2}" {debug nowarnings}] == -1 } {
+if { [build_executable ${testfile}.exp ${exec2} "${srcfile2}" $compile_options] == -1 } {
     return -1
 }