aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2013-08-23 07:51:39 -0600
committerTom Tromey <tromey@redhat.com>2013-11-04 11:01:48 -0700
commitbdfe05946663103859b225da659a21e7f8647058 (patch)
tree418e6612d82c66c90a52c01035e95f05addd3134
parent8c639e7374a512c66850f636860140530c30b44f (diff)
downloadgdb-bdfe05946663103859b225da659a21e7f8647058.zip
gdb-bdfe05946663103859b225da659a21e7f8647058.tar.gz
gdb-bdfe05946663103859b225da659a21e7f8647058.tar.bz2
fix up gdb.gdb
This fixes the gdb.gdb tests to be parallel-safe, by ensuring that the new "xgdb" file ends up in the standard output directory during the tests. 2013-11-04 Tom Tromey <tromey@redhat.com> * gdb.gdb/selftest.exp: Use standard_output_file. * lib/selftest-support.exp (do_self_tests): Use standard_output_file.
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/gdb.gdb/selftest.exp10
-rw-r--r--gdb/testsuite/lib/selftest-support.exp10
3 files changed, 22 insertions, 4 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index dda7d1b..646bb43 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,11 @@
2013-11-04 Tom Tromey <tromey@redhat.com>
+ * gdb.gdb/selftest.exp: Use standard_output_file.
+ * lib/selftest-support.exp (do_self_tests): Use
+ standard_output_file.
+
+2013-11-04 Tom Tromey <tromey@redhat.com>
+
* gdb.stabs/weird.exp: Use gdb_remote_download and
standard_output_file.
diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
index d700715..3f934cf 100644
--- a/gdb/testsuite/gdb.gdb/selftest.exp
+++ b/gdb/testsuite/gdb.gdb/selftest.exp
@@ -479,11 +479,17 @@ proc test_with_self { executable } {
set GDB_FULLPATH [find_gdb $GDB]
+if {[is_remote host]} {
+ set xgdb x$tool
+} else {
+ set xgdb [standard_output_file x$tool]
+}
+
# Remove any old copy lying around.
-remote_file host delete x$tool
+remote_file host delete $xgdb
gdb_start
-set file [remote_download host $GDB_FULLPATH x$tool]
+set file [remote_download host $GDB_FULLPATH $xgdb]
set result [test_with_self $file]
gdb_exit
catch "remote_file host delete $file"
diff --git a/gdb/testsuite/lib/selftest-support.exp b/gdb/testsuite/lib/selftest-support.exp
index fc4bccc..98a83aa 100644
--- a/gdb/testsuite/lib/selftest-support.exp
+++ b/gdb/testsuite/lib/selftest-support.exp
@@ -129,11 +129,17 @@ proc do_self_tests {function body} {
set GDB_FULLPATH [find_gdb $GDB]
+ if {[is_remote host]} {
+ set xgdb x$tool
+ } else {
+ set xgdb [standard_output_file x$tool]
+ }
+
# Remove any old copy lying around.
- remote_file host delete x$tool
+ remote_file host delete $xgdb
gdb_start
- set file [remote_download host $GDB_FULLPATH x$tool]
+ set file [remote_download host $GDB_FULLPATH $xgdb]
set result [selftest_setup $file $function]
if {$result == 0} then {