[gdb/testsuite] Minimize gdb restarts

Minimize gdb restarts, applying the following rules:
- don't use prepare_for_testing unless necessary
- don't use clean_restart unless necessary

Also, if possible, replace build_for_executable + clean_restart
with prepare_for_testing for brevity.

Touches 68 test-cases.

Tested on x86_64-linux.

diff --git a/gdb/testsuite/gdb.arch/amd64-init-x87-values.exp b/gdb/testsuite/gdb.arch/amd64-init-x87-values.exp
index 9ec5c1772f5a84ff96352c1ffaddb2d9e7f0fd54..1a748694e370f0bfb1a14806ebabbacbf88bf7a8 100644 (file)
--- a/gdb/testsuite/gdb.arch/amd64-init-x87-values.exp
+++ b/gdb/testsuite/gdb.arch/amd64-init-x87-values.exp
@@ -27,7 +27,7 @@ standard_testfile .S
 set options [list debug \
                 additional_flags=-static \
                 additional_flags=-nostartfiles]
-if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $options] } {
+if { [build_executable "failed to prepare" ${testfile} ${srcfile} $options] } {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.base/access-mem-running.exp b/gdb/testsuite/gdb.base/access-mem-running.exp
index 6990d906da2bbe641fbca853d036e790b2a56dfb..9dec5bc96c649d80f1bef4ff44f2a2b4ccae4b77 100644 (file)
--- a/gdb/testsuite/gdb.base/access-mem-running.exp
+++ b/gdb/testsuite/gdb.base/access-mem-running.exp
@@ -17,7 +17,7 @@
 
 standard_testfile
 
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug}] == -1} {
+if {[build_executable "failed to prepare" $testfile $srcfile {debug}] == -1} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.base/attach-pie-noexec.exp b/gdb/testsuite/gdb.base/attach-pie-noexec.exp
index ae3d0bc64d96ffece6c4ca553cf76bc7b7179581..85161fa7c55fd1968259a2f9136d4773beb5d056 100644 (file)
--- a/gdb/testsuite/gdb.base/attach-pie-noexec.exp
+++ b/gdb/testsuite/gdb.base/attach-pie-noexec.exp
@@ -24,7 +24,6 @@ if { [prepare_for_testing "failed to prepare" $executable "" [list debug pie]] }
     return -1
 }
 
-clean_restart $executable
 set arch ""
 set test "show architecture"
 gdb_test_multiple $test $test {

diff --git a/gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp b/gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp
index d21f580af8791b63535531d6e1bf1bef8ec97db7..c0c1fa284531860adf466fcf8b0c0fab55f0863c 100644 (file)
--- a/gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp
+++ b/gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp
@@ -32,7 +32,7 @@ if [target_info exists gdb,nointerrupts] {
 
 standard_testfile
 
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
+if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.base/bt-selected-frame.exp b/gdb/testsuite/gdb.base/bt-selected-frame.exp
index ed1a0481a2d8098cf0113ec9ea609ea9d996b74b..c454f4c9a115d2379ff1353a15e41c011c0b1efc 100644 (file)
--- a/gdb/testsuite/gdb.base/bt-selected-frame.exp
+++ b/gdb/testsuite/gdb.base/bt-selected-frame.exp
@@ -17,7 +17,7 @@
 
 standard_testfile
 
-if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } {
+if { [build_executable "failed to prepare" $testfile $srcfile debug] } {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.base/catch-syscall.exp b/gdb/testsuite/gdb.base/catch-syscall.exp
index a92730c05e6c3dca71a4c082fc3f6fc9db0a47b6..d7183d18bcdb815fd05b71c10e319a90a53cd28f 100644 (file)
--- a/gdb/testsuite/gdb.base/catch-syscall.exp
+++ b/gdb/testsuite/gdb.base/catch-syscall.exp
@@ -26,7 +26,6 @@ if  { [prepare_for_testing "failed to prepare" $testfile ${testfile}.c] } {
 }
 
 # Check target supports catch syscall or not.
-clean_restart $binfile
 if ![runto_main] then {
     fail "can't run to main"
     return

diff --git a/gdb/testsuite/gdb.base/condbreak.exp b/gdb/testsuite/gdb.base/condbreak.exp
index 3fd0f0782b4c4d7ec7828535315e96e3e7efd9be..5bcc7e76cf00da46aeefdaef6d603d8ec0d2c2c0 100644 (file)
--- a/gdb/testsuite/gdb.base/condbreak.exp
+++ b/gdb/testsuite/gdb.base/condbreak.exp
@@ -32,9 +32,6 @@ if [get_compiler_info] {
     return -1
 }
 
-clean_restart ${binfile}
-
-
 set bp_location1  [gdb_get_line_number "set breakpoint 1 here"]
 set bp_location6  [gdb_get_line_number "set breakpoint 6 here"]
 set bp_location8  [gdb_get_line_number "set breakpoint 8 here" $srcfile2]

diff --git a/gdb/testsuite/gdb.base/cvexpr.exp b/gdb/testsuite/gdb.base/cvexpr.exp
index 6048699c13335a89855cdec2b235ed9453a579dc..c434c11f45faf2529c1247e42421c7a470e596f0 100644 (file)
--- a/gdb/testsuite/gdb.base/cvexpr.exp
+++ b/gdb/testsuite/gdb.base/cvexpr.exp
@@ -31,8 +31,6 @@ proc do_test {dir options} {
        return 0
     }
 
-    clean_restart ${binfile}
-
     gdb_test_no_output "set print sevenbit-strings"
     gdb_test_no_output "set print address off"
     gdb_test_no_output "set width 0"

diff --git a/gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp b/gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp
index 11fa71073973b6c606d052b724c386476459b136..58a5560cc5c5c14b70154dc8ff0064b1fdba18d9 100644 (file)
--- a/gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp
+++ b/gdb/testsuite/gdb.base/dprintf-bp-same-addr.exp
@@ -17,7 +17,7 @@
 
 standard_testfile
 
-if [prepare_for_testing "failed to prepare" \
+if [build_executable "failed to prepare" \
     ${testfile} ${srcfile} {debug}] {
     return -1
 }

diff --git a/gdb/testsuite/gdb.base/dprintf-detach.exp b/gdb/testsuite/gdb.base/dprintf-detach.exp
index 1a94d26f84c0e9478a149f75d252123b0573d76d..aa06a5bee527ef3ec5bb5677c34551673a89e816 100644 (file)
--- a/gdb/testsuite/gdb.base/dprintf-detach.exp
+++ b/gdb/testsuite/gdb.base/dprintf-detach.exp
@@ -28,7 +28,7 @@ if { [use_gdb_stub] } then {
 standard_testfile
 set escapedbinfile [string_to_regexp ${binfile}]
 
-if [prepare_for_testing "failed to prepare for dprintf-detach" \
+if [build_executable "failed to prepare for dprintf-detach" \
     ${testfile} ${srcfile} {debug}] {
     return -1
 }

diff --git a/gdb/testsuite/gdb.base/duplicate-bp.exp b/gdb/testsuite/gdb.base/duplicate-bp.exp
index 77fa160e09416a890a485abf74fb1491f283cb71..5516925b8b426648e42a5f2cef9c5acc921559b1 100644 (file)
--- a/gdb/testsuite/gdb.base/duplicate-bp.exp
+++ b/gdb/testsuite/gdb.base/duplicate-bp.exp
@@ -15,7 +15,7 @@
 
 standard_testfile
 
-if { [prepare_for_testing "failed to prepare" ${testfile}] } {
+if { [build_executable "failed to prepare" ${testfile}] } {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.base/fork-print-inferior-events.exp b/gdb/testsuite/gdb.base/fork-print-inferior-events.exp
index eda0f50ca7b14f796e7d0f0721b1500340bc637e..051aeb76fa68bd5682f1ee244a3edad79534f6e5 100644 (file)
--- a/gdb/testsuite/gdb.base/fork-print-inferior-events.exp
+++ b/gdb/testsuite/gdb.base/fork-print-inferior-events.exp
@@ -34,7 +34,7 @@ if [gdb_debug_enabled] {
 
 standard_testfile
 
-if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } {
+if { [build_executable "failed to prepare" $testfile $srcfile debug] } {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.base/frameapply.exp b/gdb/testsuite/gdb.base/frameapply.exp
index 1c580008b4611730869ea1d0de997f3250200bbd..346d2296c5d425224310472fdc0724303f9f39d9 100644 (file)
--- a/gdb/testsuite/gdb.base/frameapply.exp
+++ b/gdb/testsuite/gdb.base/frameapply.exp
@@ -24,9 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile}] } {
     return -1
 }
 
-clean_restart ${binfile}
-
-
 if ![runto setup_done] then {
     fail "can't run to setup_done"
     return 0

diff --git a/gdb/testsuite/gdb.base/gcore-relro-pie.exp b/gdb/testsuite/gdb.base/gcore-relro-pie.exp
index 39142fe4254646392441de8deec0e199100c1248..6c2bfc37d85ee52738b84653034cb1846c767a92 100644 (file)
--- a/gdb/testsuite/gdb.base/gcore-relro-pie.exp
+++ b/gdb/testsuite/gdb.base/gcore-relro-pie.exp
@@ -19,7 +19,7 @@
 
 standard_testfile
 
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
+if {[build_executable "failed to prepare" $testfile $srcfile \
         {debug pie "ldflags=-Wl,-z,relro"}]} {
     return -1
 }

diff --git a/gdb/testsuite/gdb.base/gcore-tls-pie.exp b/gdb/testsuite/gdb.base/gcore-tls-pie.exp
index e514c42d4988b39623a4fe6febd4add74ec70f3c..bb635cb10452b062a7445b6499e12cbe6198ab39 100644 (file)
--- a/gdb/testsuite/gdb.base/gcore-tls-pie.exp
+++ b/gdb/testsuite/gdb.base/gcore-tls-pie.exp
@@ -23,7 +23,7 @@ if { [have_fuse_ld_gold] == 0} {
     return -1
 }
 
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
+if {[build_executable "failed to prepare" $testfile $srcfile \
         {debug pie "ldflags=-fuse-ld=gold"}]} {
     return -1
 }

diff --git a/gdb/testsuite/gdb.base/index-cache.exp b/gdb/testsuite/gdb.base/index-cache.exp
index 496145ed8fccf8e423f07b63b095635f2426482f..8dd35ad80bd76cb94b0ef5af0c8c8a6e03f4900c 100644 (file)
--- a/gdb/testsuite/gdb.base/index-cache.exp
+++ b/gdb/testsuite/gdb.base/index-cache.exp
@@ -18,7 +18,7 @@
 
 standard_testfile
 
-if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
+if { [build_executable "failed to prepare" $testfile $srcfile \
          {debug additional_flags=-Wl,--build-id}] } {
     return
 }

diff --git a/gdb/testsuite/gdb.base/info_minsym.exp b/gdb/testsuite/gdb.base/info_minsym.exp
index 7353bcffab434120a87226a410dceac646bb34aa..fe3f4c550d767f081b839661dd96b807e9912fb0 100644 (file)
--- a/gdb/testsuite/gdb.base/info_minsym.exp
+++ b/gdb/testsuite/gdb.base/info_minsym.exp
@@ -27,8 +27,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {c}]} {
     return -1
 }
 
-clean_restart ${testfile}
-
 gdb_test_no_output "info variables -q -t int minsym" \
     "minsym variables do not match type"
 gdb_test_no_output "info functions -q -t int minsym" \

diff --git a/gdb/testsuite/gdb.base/info_qt.exp b/gdb/testsuite/gdb.base/info_qt.exp
index 3f6e1428679a59a5129efa5f8081d219f97189f0..c6f242b9d03197ee2cab7a00e2b96780a6f7b0c1 100644 (file)
--- a/gdb/testsuite/gdb.base/info_qt.exp
+++ b/gdb/testsuite/gdb.base/info_qt.exp
@@ -27,8 +27,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile}] } {
     return -1
 }
 
-clean_restart ${binfile}
-
 if ![runto setup_done] then {
     fail "can't run to setup_done"
     return 0

diff --git a/gdb/testsuite/gdb.base/killed-outside.exp b/gdb/testsuite/gdb.base/killed-outside.exp
index 3c5ce25f6e4d7a36a54173beca92b0dcee6da6a6..0e14d5a2f92bdde5cc04d35ab061620f1de52af6 100644 (file)
--- a/gdb/testsuite/gdb.base/killed-outside.exp
+++ b/gdb/testsuite/gdb.base/killed-outside.exp
@@ -80,7 +80,7 @@ proc test {cmds_after_kill} {
     }
 }
 
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile] == -1} {
+if {[build_executable "failed to prepare" $testfile $srcfile] == -1} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.base/list.exp b/gdb/testsuite/gdb.base/list.exp
index 672c26abcb955b405f09e26e97e805a64f3e3851..6844b87084e3cb3fc59bbf4983f7fbc432581627 100644 (file)
--- a/gdb/testsuite/gdb.base/list.exp
+++ b/gdb/testsuite/gdb.base/list.exp
@@ -21,7 +21,7 @@ standard_testfile list0.c list1.c
 # Need to download the header to the host.
 gdb_remote_download host ${srcdir}/${subdir}/list0.h
 
-if {[prepare_for_testing "failed to prepare" $testfile [list $srcfile $srcfile2] \
+if {[build_executable "failed to prepare" $testfile [list $srcfile $srcfile2] \
         {debug}]} {
     return -1
 }

diff --git a/gdb/testsuite/gdb.base/many-headers.exp b/gdb/testsuite/gdb.base/many-headers.exp
index 100c3e64809fd42df7b62afb3a5b4731dc858e73..cc25b2e63ff353aa98719880eb6311240194065e 100644 (file)
--- a/gdb/testsuite/gdb.base/many-headers.exp
+++ b/gdb/testsuite/gdb.base/many-headers.exp
@@ -26,7 +26,7 @@ if { [target_info gdb_protocol] != "" } {
 
 standard_testfile
 
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
+if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.base/msym-lang.exp b/gdb/testsuite/gdb.base/msym-lang.exp
index 4b679868f0af3efd6b51894a9edb827916d1c41a..72f817e3a3aa5c2ff576daab1ddc51aa4a59946b 100644 (file)
--- a/gdb/testsuite/gdb.base/msym-lang.exp
+++ b/gdb/testsuite/gdb.base/msym-lang.exp
@@ -20,6 +20,4 @@ if {[prepare_for_testing "failed to prepare" $testfile [list $srcfile $srcfile2]
     return -1
 }
 
-clean_restart ${testfile}
-
 gdb_test "info func foo" ".* foo\\(\\).* foo\\(\\).*"

diff --git a/gdb/testsuite/gdb.base/noreturn-finish.exp b/gdb/testsuite/gdb.base/noreturn-finish.exp
index 16e0439b7b03c0e2c314c426fd5444aa4e6f0c21..34db7c02a6a703205dfe095dbf2287122881b6e2 100644 (file)
--- a/gdb/testsuite/gdb.base/noreturn-finish.exp
+++ b/gdb/testsuite/gdb.base/noreturn-finish.exp
@@ -46,6 +46,4 @@ proc noreturn_finish_test { } {
    }
 }
 
-clean_restart ${binfile}
-
 noreturn_finish_test

diff --git a/gdb/testsuite/gdb.base/noreturn-return.exp b/gdb/testsuite/gdb.base/noreturn-return.exp
index 228625f8b0cf5474497b8a0da4c3fc9c467229dd..294223988aa225abbb7ca337f00445e03b383fc3 100644 (file)
--- a/gdb/testsuite/gdb.base/noreturn-return.exp
+++ b/gdb/testsuite/gdb.base/noreturn-return.exp
@@ -46,6 +46,4 @@ proc noreturn_test { } {
    }
 }
 
-clean_restart ${binfile}
-
 noreturn_test

diff --git a/gdb/testsuite/gdb.base/pie-fork.exp b/gdb/testsuite/gdb.base/pie-fork.exp
index d093c195da0e30ee2129feb6993a5e820032f950..5ab65213003cb64046738fed2e653d64cad1f674 100644 (file)
--- a/gdb/testsuite/gdb.base/pie-fork.exp
+++ b/gdb/testsuite/gdb.base/pie-fork.exp
@@ -20,7 +20,7 @@ standard_testfile
 
 set opts [list debug pie]
 
-if [prepare_for_testing "failed to prepare" $testfile $srcfile $opts] {
+if [build_executable "failed to prepare" $testfile $srcfile $opts] {
     return
 }
 

diff --git a/gdb/testsuite/gdb.base/random-signal.exp b/gdb/testsuite/gdb.base/random-signal.exp
index 8511e83fce5d82c6abf134a432b119e37e16fa9f..b3d04a97e9d613fe0102fa6f9371ec3d9be6ee9c 100644 (file)
--- a/gdb/testsuite/gdb.base/random-signal.exp
+++ b/gdb/testsuite/gdb.base/random-signal.exp
@@ -26,7 +26,7 @@ if [target_info exists gdb,nointerrupts] {
 
 standard_testfile
 
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
+if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.base/reread-readsym.exp b/gdb/testsuite/gdb.base/reread-readsym.exp
index 673e566ceeba0ba318bd6b63b261004bc82f4343..597e46ac8963bf22f4b82c7d09fcdde7db308d2f 100644 (file)
--- a/gdb/testsuite/gdb.base/reread-readsym.exp
+++ b/gdb/testsuite/gdb.base/reread-readsym.exp
@@ -46,9 +46,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
     return -1
 }
 
-# Start with a fresh gdb.
-clean_restart ${testfile}
-
 # Using the source command to read commands from a file is important,
 # otherwise section data is freed and reallocated using the same
 # memory locations and the bug is not exposed.

diff --git a/gdb/testsuite/gdb.base/share-env-with-gdbserver.exp b/gdb/testsuite/gdb.base/share-env-with-gdbserver.exp
index 261a51e3921afab30d1137810f50959fd5dff59c..e848f2730e70875e5d2c5bc53fdcc8dafb1dbf0e 100644 (file)
--- a/gdb/testsuite/gdb.base/share-env-with-gdbserver.exp
+++ b/gdb/testsuite/gdb.base/share-env-with-gdbserver.exp
@@ -23,7 +23,7 @@ if { [use_gdb_stub] } {
 
 standard_testfile
 
-if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } {
+if { [build_executable "failed to prepare" $testfile $srcfile debug] } {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.base/stack-protector.exp b/gdb/testsuite/gdb.base/stack-protector.exp
index f04263019d60092dfe054a74bbfbb37daf05147a..5181ce89383b4f9ed3e20a86f9bacca7e3f22b1b 100644 (file)
--- a/gdb/testsuite/gdb.base/stack-protector.exp
+++ b/gdb/testsuite/gdb.base/stack-protector.exp
@@ -44,8 +44,6 @@ proc simple_func_break_test { protection } {
        return -1
     }
 
-    clean_restart ${binfile}
-
     if { ![runto_main] } then {
        fail "can't run to main"
        return -1

diff --git a/gdb/testsuite/gdb.base/startup-with-shell.exp b/gdb/testsuite/gdb.base/startup-with-shell.exp
index 8662b894472257d8c58b11940c6df4410f106af0..a78ad534f286c8e9cad7b2c118f3d7808d468081 100644 (file)
--- a/gdb/testsuite/gdb.base/startup-with-shell.exp
+++ b/gdb/testsuite/gdb.base/startup-with-shell.exp
@@ -30,7 +30,7 @@ if { [is_remote target] } {
 
 standard_testfile
 
-if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } {
+if { [build_executable "failed to prepare" $testfile $srcfile debug] } {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.base/step-over-exit.exp b/gdb/testsuite/gdb.base/step-over-exit.exp
index ff9666b735404869aba0432729faa3be29ec9a32..d9a47d36d739b4c3b9436c3b928a25e4f7c08f70 100644 (file)
--- a/gdb/testsuite/gdb.base/step-over-exit.exp
+++ b/gdb/testsuite/gdb.base/step-over-exit.exp
@@ -35,8 +35,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
     return -1
 }
 
-# Start with a fresh gdb.
-clean_restart ${testfile}
 if ![runto_main] {
     fail "can't run to main"
     return -1

diff --git a/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp b/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp
index 270bc6c29afd9040dcfd9d7ff2481b8759514302..33adda7b5f82a6ee7a89d4c02eab2a9b3869b55c 100644 (file)
--- a/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp
@@ -30,8 +30,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
     return -1
 }
 
-clean_restart $binfile
-
 if ![runto_main] {
     untested "can't run to main"
     return -1

diff --git a/gdb/testsuite/gdb.base/whatis.exp b/gdb/testsuite/gdb.base/whatis.exp
index ddeb031d8322e5a337191599c7d9d5a42447deae..90baf3e1f2323baf9c517d36f215f64b87b78663 100644 (file)
--- a/gdb/testsuite/gdb.base/whatis.exp
+++ b/gdb/testsuite/gdb.base/whatis.exp
@@ -51,8 +51,6 @@ proc do_test {dir options} {
        return 0
     }
 
-    clean_restart ${binfile}
-
     #
     # Test whatis command with basic C types
     #

diff --git a/gdb/testsuite/gdb.cp/cplusfuncs.exp b/gdb/testsuite/gdb.cp/cplusfuncs.exp
index 737401553057ade1eaa6bcda28c93eb3b2f0f6c0..7d021a7ed8c3597ce5897293bdbccb518de7e167 100644 (file)
--- a/gdb/testsuite/gdb.cp/cplusfuncs.exp
+++ b/gdb/testsuite/gdb.cp/cplusfuncs.exp
@@ -581,8 +581,6 @@ proc do_tests {} {
     global binfile
     global dm_type_int_star
 
-    clean_restart $binfile
-
     gdb_test_no_output "set width 0"
 
     runto_main

diff --git a/gdb/testsuite/gdb.cp/rvalue-ref-params.exp b/gdb/testsuite/gdb.cp/rvalue-ref-params.exp
index 1fd3edb0584517f761e006db3222c6a0a2cab3fa..e806662b31d03757c94327d4d71f1c37b4bb432c 100644 (file)
--- a/gdb/testsuite/gdb.cp/rvalue-ref-params.exp
+++ b/gdb/testsuite/gdb.cp/rvalue-ref-params.exp
@@ -20,7 +20,7 @@ if {[skip_cplus_tests]} { continue }
 
 standard_testfile .cc
 
-if {[prepare_for_testing $testfile.exp $testfile $srcfile \
+if {[build_executable $testfile.exp $testfile $srcfile \
     {debug c++ additional_flags="-std=gnu++11"}] == -1} {
     return -1
 }

diff --git a/gdb/testsuite/gdb.cp/static-typedef-print.exp b/gdb/testsuite/gdb.cp/static-typedef-print.exp
index 5a6cdbde5277f647d194f0eaa508f24527a05059..3c8e286a1f205647373639572690f3ea8a4d4c5e 100644 (file)
--- a/gdb/testsuite/gdb.cp/static-typedef-print.exp
+++ b/gdb/testsuite/gdb.cp/static-typedef-print.exp
@@ -25,8 +25,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
     return -1
 }
 
-clean_restart $testfile
-
 if ![runto_main] {
     untested "could not run to main"
     return -1

diff --git a/gdb/testsuite/gdb.cp/typedef-base.exp b/gdb/testsuite/gdb.cp/typedef-base.exp
index 8376e1953527ae237dcf71a96aed1eb66a3ba460..7edc1640c45740c3b10df760a186975aa508ba85 100644 (file)
--- a/gdb/testsuite/gdb.cp/typedef-base.exp
+++ b/gdb/testsuite/gdb.cp/typedef-base.exp
@@ -27,8 +27,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
     return -1
 }
 
-clean_restart $testfile
-
 if ![runto_main] {
     untested "could not run to main"
     return -1

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp b/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp
index bfe6a9c5cbb03bea0abeff3c2db5bf0dc63ef349..9351985319346e7d13078f1dc91886d234c90f8d 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp
@@ -24,7 +24,7 @@ if {![dwarf2_support]} {
 
 standard_testfile .S main.c
 
-if { [prepare_for_testing "failed to prepare" ${testfile} \
+if { [build_executable "failed to prepare" ${testfile} \
          [list $srcfile $srcfile2] {nodebug}] } {
     return -1
 }

diff --git a/gdb/testsuite/gdb.dwarf2/enqueued-cu-base-addr.exp b/gdb/testsuite/gdb.dwarf2/enqueued-cu-base-addr.exp
index 3cf6b0799088078a3104125656bc2420e6aa6aa4..dab19d0c4314eafffd12c5b421125b07ee90bf98 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/enqueued-cu-base-addr.exp
+++ b/gdb/testsuite/gdb.dwarf2/enqueued-cu-base-addr.exp
@@ -27,12 +27,6 @@ standard_testfile main.c .S
 set executable ${testfile}
 set asm_file [standard_output_file ${srcfile2}]
 
-# We need to know the size of integer types in order to write some of the
-# debugging info we'd like to generate.
-if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] {
-    return -1
-}
-
 # Create the DWARF.
 Dwarf::assemble $asm_file {
     global srcdir subdir srcfile
@@ -83,8 +77,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} \
     return -1
 }
 
-clean_restart ${binfile}
-
 # Expand cu1.  This will enqueue cu2.
 gdb_test "ptype foo" "type = int"
 

diff --git a/gdb/testsuite/gdb.dwarf2/fission-absolute-dwo.exp b/gdb/testsuite/gdb.dwarf2/fission-absolute-dwo.exp
index 2483349bf78d2a86dc148ddaae7499af4d2e086b..082a09dbcfe7cab6d101a2c8b54e00019454867e 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/fission-absolute-dwo.exp
+++ b/gdb/testsuite/gdb.dwarf2/fission-absolute-dwo.exp
@@ -27,10 +27,6 @@ if {![dwarf2_support]} {
 
 standard_testfile .c -dw.S
 
-if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
-}
-
 set asm_file [standard_output_file $srcfile2]
 Dwarf::assemble $asm_file {
     global srcfile binfile objdir

diff --git a/gdb/testsuite/gdb.dwarf2/fission-relative-dwo.exp b/gdb/testsuite/gdb.dwarf2/fission-relative-dwo.exp
index 566d756c1a86f59736c4826e7d8f9bf4415c8d12..8faa6eaee31c39c4c0e0c96f4019c4bbec1a92fb 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/fission-relative-dwo.exp
+++ b/gdb/testsuite/gdb.dwarf2/fission-relative-dwo.exp
@@ -25,10 +25,6 @@ if {![dwarf2_support]} {
 
 standard_testfile .c -dw.S
 
-if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
-    return -1
-}
-
 set asm_file [standard_output_file $srcfile2]
 Dwarf::assemble $asm_file {
     global srcfile gdb_test_file_name

diff --git a/gdb/testsuite/gdb.fortran/array-slices.exp b/gdb/testsuite/gdb.fortran/array-slices.exp
index f9671ec1f0071354eae590a480fc67f192160a41..8200a0ca284bcf9c442a16b10ce71e1b56f2d6ce 100644 (file)
--- a/gdb/testsuite/gdb.fortran/array-slices.exp
+++ b/gdb/testsuite/gdb.fortran/array-slices.exp
@@ -38,7 +38,7 @@ if {[skip_fortran_tests]} { return -1 }
 standard_testfile ".f90"
 load_lib fortran.exp
 
-if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
+if {[build_executable ${testfile}.exp ${testfile} ${srcfile} \
         {debug f90}]} {
     return -1
 }

diff --git a/gdb/testsuite/gdb.fortran/nested-funcs-2.exp b/gdb/testsuite/gdb.fortran/nested-funcs-2.exp
index 9ab3ee599a0ee48b271834ad80a21e1ca1db9fd8..f679529478a446b8d3c986fb2794dd0c0a3526d8 100644 (file)
--- a/gdb/testsuite/gdb.fortran/nested-funcs-2.exp
+++ b/gdb/testsuite/gdb.fortran/nested-funcs-2.exp
@@ -20,7 +20,7 @@ load_lib "fortran.exp"
 
 standard_testfile ".f90"
 
-if {[prepare_for_testing ${testfile}.exp ${testfile} \
+if {[build_executable ${testfile}.exp ${testfile} \
         ${srcfile} {debug f90}]} {
     return -1
 }

diff --git a/gdb/testsuite/gdb.fortran/subarray.exp b/gdb/testsuite/gdb.fortran/subarray.exp
index 8c7d5a979407f9a2afa8c2eb27322e7f424405d7..d41443a88b0f4d7ff816c9030803e448c8f38484 100644 (file)
--- a/gdb/testsuite/gdb.fortran/subarray.exp
+++ b/gdb/testsuite/gdb.fortran/subarray.exp
@@ -27,11 +27,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} {
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 if ![fortran_runto_main] then {
     perror "couldn't run to main"
     continue

diff --git a/gdb/testsuite/gdb.gdb/unittest.exp b/gdb/testsuite/gdb.gdb/unittest.exp
index 3622243492cc83cf7874184d67c06f40ea62e25a..670205fff769c26bce6bc062b76af5118a25c108 100644 (file)
--- a/gdb/testsuite/gdb.gdb/unittest.exp
+++ b/gdb/testsuite/gdb.gdb/unittest.exp
@@ -24,7 +24,7 @@ set do_xml_test [expr ![gdb_skip_xml_test]]
 
 standard_testfile
 
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
+if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-fortran-modules.exp b/gdb/testsuite/gdb.mi/mi-fortran-modules.exp
index 06069953afabd616a93bfaf3c4fee8cbdc5b2a8c..fc1fa411ee3b91e9bbe3c2d79bea26cb70e92b72 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-fortran-modules.exp
+++ b/gdb/testsuite/gdb.mi/mi-fortran-modules.exp
@@ -23,7 +23,7 @@ set MIFLAGS "-i=mi"
 
 standard_testfile "mi-fortran-modules.f90" "mi-fortran-modules-2.f90"
 
-if {[prepare_for_testing "failed to prepare" ${testfile} \
+if {[build_executable "failed to prepare" ${testfile} \
         [list $srcfile2 $srcfile] {debug f90}]} {
     return -1
 }

diff --git a/gdb/testsuite/gdb.mi/mi-info-sources.exp b/gdb/testsuite/gdb.mi/mi-info-sources.exp
index a43e939063aff997a0f40e24221b6c5e42fa6f32..7451af6595224bb0ba5a107eacaa6c581ac150ea 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-info-sources.exp
+++ b/gdb/testsuite/gdb.mi/mi-info-sources.exp
@@ -20,7 +20,7 @@ set MIFLAGS "-i=mi"
 
 standard_testfile .c -base.c
 
-if {[prepare_for_testing $testfile.exp $testfile \
+if {[build_executable $testfile.exp $testfile \
         [list $srcfile $srcfile2] debug]} {
     untested $testfile.exp
     return -1

diff --git a/gdb/testsuite/gdb.mi/mi-linespec-err-cp.exp b/gdb/testsuite/gdb.mi/mi-linespec-err-cp.exp
index 4f7150bf1ac44d45e1067d426b022c6e0d720066..dacbdd8962d707d22a327c01386fc160f7d26e6d 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-linespec-err-cp.exp
+++ b/gdb/testsuite/gdb.mi/mi-linespec-err-cp.exp
@@ -27,7 +27,7 @@ set MIFLAGS "-i=mi"
 standard_testfile .cc
 set exefile $testfile
 
-if {[prepare_for_testing "failed to prepare" $exefile $srcfile {debug c++}]} {
+if {[build_executable "failed to prepare" $exefile $srcfile {debug c++}]} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-sym-info.exp b/gdb/testsuite/gdb.mi/mi-sym-info.exp
index dfe23ec49ca451382cdc96cd616079d29182b990..5eb720119899d6b0071d5889dde9a0f2a9c597d4 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-sym-info.exp
+++ b/gdb/testsuite/gdb.mi/mi-sym-info.exp
@@ -28,7 +28,7 @@ set MIFLAGS "-i=mi"
 
 standard_testfile mi-sym-info-1.c mi-sym-info-2.c
 
-if {[prepare_for_testing "failed to prepare" ${testfile} \
+if {[build_executable "failed to prepare" ${testfile} \
         [list $srcfile $srcfile2] {debug}]} {
     return -1
 }

diff --git a/gdb/testsuite/gdb.multi/info-threads.exp b/gdb/testsuite/gdb.multi/info-threads.exp
index 8ebd03b290c6acbb2b1df0bd7b5bec78cea73e6d..cc8b22a6f3c8e5829c692d216044f7bd6d5e97f3 100644 (file)
--- a/gdb/testsuite/gdb.multi/info-threads.exp
+++ b/gdb/testsuite/gdb.multi/info-threads.exp
@@ -24,8 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {pthreads d
     return -1
 }
 
-clean_restart ${testfile}
-
 if { ![runto_main] } then {
     return -1
 }

diff --git a/gdb/testsuite/gdb.multi/multi-arch.exp b/gdb/testsuite/gdb.multi/multi-arch.exp
index e859282dbc4e3dac365b6b13f8c76a0d29c65d5a..c1c77917e4541e51e901bde96f04251eac558706 100644 (file)
--- a/gdb/testsuite/gdb.multi/multi-arch.exp
+++ b/gdb/testsuite/gdb.multi/multi-arch.exp
@@ -52,7 +52,7 @@ if [istarget "s390*-*-*"] {
     set march2 "-m32"
 }
 
-if { [prepare_for_testing "failed to prepare" ${exec1} "${srcfile1}" \
+if { [build_executable "failed to prepare" ${exec1} "${srcfile1}" \
          [list debug additional_flags=${march1}]] } {
     return -1
 }
@@ -70,7 +70,7 @@ if [istarget "aarch64*-*-*"] {
     lappend options "additional_flags=${march2}"
 }
 
-if { [prepare_for_testing "failed to prepare" ${exec2} "${srcfile2}" \
+if { [build_executable "failed to prepare" ${exec2} "${srcfile2}" \
         $options]} {
     return -1
 }

diff --git a/gdb/testsuite/gdb.multi/multi-re-run.exp b/gdb/testsuite/gdb.multi/multi-re-run.exp
index 8bf126ef95ac68706ab974fa6d280ae5ade82bbf..6eda6fafb5bccc4ab29545305e63a7f24c4f21e3 100644 (file)
--- a/gdb/testsuite/gdb.multi/multi-re-run.exp
+++ b/gdb/testsuite/gdb.multi/multi-re-run.exp
@@ -31,14 +31,14 @@ set srcfile2 multi-re-run-2.c
 set binfile2 [standard_output_file ${exec2}]
 
 with_test_prefix "exec1" {
-    if { [prepare_for_testing "failed to prepare" ${exec1} "${srcfile1}" \
+    if { [build_executable "failed to prepare" ${exec1} "${srcfile1}" \
              [list pthreads debug]] } {
        return -1
     }
 }
 
 with_test_prefix "exec2" {
-    if { [prepare_for_testing "failed to prepare" ${exec2} "${srcfile2}" \
+    if { [build_executable "failed to prepare" ${exec2} "${srcfile2}" \
              [list pthreads debug]] } {
        return -1
     }

diff --git a/gdb/testsuite/gdb.multi/run-only-second-inf.exp b/gdb/testsuite/gdb.multi/run-only-second-inf.exp
index e5d124916d42e0a136192c6761868b3c73aef255..69ff07bea28a0f24c274ec2b21a1f2e8b67a6b28 100644 (file)
--- a/gdb/testsuite/gdb.multi/run-only-second-inf.exp
+++ b/gdb/testsuite/gdb.multi/run-only-second-inf.exp
@@ -24,7 +24,7 @@ if {[use_gdb_stub]} {
     return 0
 }
 
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug}]} {
+if {[build_executable "failed to prepare" $testfile $srcfile {debug}]} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.multi/tids-gid-reset.exp b/gdb/testsuite/gdb.multi/tids-gid-reset.exp
index d8dac7cf7feaded374d7f0f028a5d76997616590..e1755f9a6891dc859fbf7edd644f9e625d16b239 100644 (file)
--- a/gdb/testsuite/gdb.multi/tids-gid-reset.exp
+++ b/gdb/testsuite/gdb.multi/tids-gid-reset.exp
@@ -22,7 +22,8 @@
 
 standard_testfile
 
-if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {pthreads debug}] } {
+if { [build_executable "failed to prepare" ${testfile} ${srcfile} \
+         {pthreads debug}] } {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.multi/tids.exp b/gdb/testsuite/gdb.multi/tids.exp
index f1d6db60f70d163fc7871977a1b85d28da3129cf..1bf04c509c061b32d82534e76a12233e704c28f4 100644 (file)
--- a/gdb/testsuite/gdb.multi/tids.exp
+++ b/gdb/testsuite/gdb.multi/tids.exp
@@ -31,8 +31,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {pthreads d
     return -1
 }
 
-clean_restart ${testfile}
-
 if { ![runto_main] } then {
     return -1
 }

diff --git a/gdb/testsuite/gdb.python/py-infthread.exp b/gdb/testsuite/gdb.python/py-infthread.exp
index aa0b802a11e96191be6740cfec04747404aea44d..e68986bdfa778a6f3db4e7fe46537848fbad519a 100644 (file)
--- a/gdb/testsuite/gdb.python/py-infthread.exp
+++ b/gdb/testsuite/gdb.python/py-infthread.exp
@@ -24,9 +24,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
     return -1
 }
 
-# Start with a fresh gdb.
-clean_restart ${testfile}
-
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 

diff --git a/gdb/testsuite/gdb.server/connect-stopped-target.exp b/gdb/testsuite/gdb.server/connect-stopped-target.exp
index 06a4e98d85ed358e91a8bd19d3d5d5a21e9d1d90..bab3b88a194c260287b505a1ae50085e77b06f9a 100644 (file)
--- a/gdb/testsuite/gdb.server/connect-stopped-target.exp
+++ b/gdb/testsuite/gdb.server/connect-stopped-target.exp
@@ -27,7 +27,7 @@ if {[skip_gdbserver_tests]} {
 standard_testfile
 set executable ${testfile}
 
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
+if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.server/exit-multiple-threads.exp b/gdb/testsuite/gdb.server/exit-multiple-threads.exp
index a74f7d124490cfc6e721fb2dfac0de299bb914f2..27c09b234e263c21cb3e753e89c1cb7528090179 100644 (file)
--- a/gdb/testsuite/gdb.server/exit-multiple-threads.exp
+++ b/gdb/testsuite/gdb.server/exit-multiple-threads.exp
@@ -135,7 +135,7 @@ foreach_with_prefix test { exit signal } {
     set func "run_${test}_test"
 
     set executable "$binfile-${test}"
-    if [prepare_for_testing "failed to prepare" $executable $srcfile \
+    if [build_executable "failed to prepare" $executable $srcfile \
            [list debug pthreads additional_flags=-D${def}]] {
        return -1
     }

diff --git a/gdb/testsuite/gdb.server/run-without-local-binary.exp b/gdb/testsuite/gdb.server/run-without-local-binary.exp
index 395eddc9106433082fa0c840a10ef4f6156175be..7c96c9bc3219b642a0aeae53511151885894c00b 100644 (file)
--- a/gdb/testsuite/gdb.server/run-without-local-binary.exp
+++ b/gdb/testsuite/gdb.server/run-without-local-binary.exp
@@ -21,7 +21,7 @@ if {[skip_gdbserver_tests]} {
 
 standard_testfile normal.c
 
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
+if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.threads/access-mem-running-thread-exit.exp b/gdb/testsuite/gdb.threads/access-mem-running-thread-exit.exp
index ea228e4ba13ef191384b5694a990fb769a919f36..b2fef9fca6addea1087cd467fdc629079b2efb38 100644 (file)
--- a/gdb/testsuite/gdb.threads/access-mem-running-thread-exit.exp
+++ b/gdb/testsuite/gdb.threads/access-mem-running-thread-exit.exp
@@ -35,7 +35,7 @@
 
 standard_testfile
 
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}] == -1} {
+if {[build_executable "failed to prepare" $testfile $srcfile {debug pthreads}] == -1} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp b/gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp
index cb632572e08168d961fe5b5a0cfbd22d854407a4..255e48350aa52402fc6f50b84dbe34e6c415ef33 100644 (file)
--- a/gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp
+++ b/gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp
@@ -62,8 +62,6 @@ proc test {} {
     global gdb_prompt
     global decimal
 
-    clean_restart ${binfile}
-
     set test_spawn_id [spawn_wait_for_attach $binfile]
     set testpid [spawn_id_get_pid $test_spawn_id]
 
@@ -170,7 +168,8 @@ proc test {} {
 # failure.
 set options { "additional_flags=-DTIMEOUT=$timeout" debug pthreads }
 
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile $options] == -1} {
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
+        $options] == -1} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.threads/break-while-running.exp b/gdb/testsuite/gdb.threads/break-while-running.exp
index 68d9bf86d37a9409f7e030fe2b6bdb15ddb0107b..de398241ecfd8b0fcea461063627075be92956ed 100644 (file)
--- a/gdb/testsuite/gdb.threads/break-while-running.exp
+++ b/gdb/testsuite/gdb.threads/break-while-running.exp
@@ -24,7 +24,7 @@
 
 standard_testfile
 
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}] == -1} {
+if {[build_executable "failed to prepare" $testfile $srcfile {debug pthreads}] == -1} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.threads/clone-attach-detach.exp b/gdb/testsuite/gdb.threads/clone-attach-detach.exp
index 4c6813b0ece64deb6152f6cdbbf3eb5ce927e6d5..2232857ef30390d5c3cb575377f4c2bd3ddd73ce 100644 (file)
--- a/gdb/testsuite/gdb.threads/clone-attach-detach.exp
+++ b/gdb/testsuite/gdb.threads/clone-attach-detach.exp
@@ -33,8 +33,6 @@ if [prepare_for_testing "failed to prepare" $testfile $srcfile {debug}] {
     return -1
 }
 
-clean_restart ${binfile}
-
 set test_spawn_id [spawn_wait_for_attach $binfile]
 set testpid [spawn_id_get_pid $test_spawn_id]
 

diff --git a/gdb/testsuite/gdb.threads/next-bp-other-thread.exp b/gdb/testsuite/gdb.threads/next-bp-other-thread.exp
index 1abbe585f652075f19d7ee56294f857b5974eb61..d168f6b3e29a2a39e224596e7054122b853d189a 100644 (file)
--- a/gdb/testsuite/gdb.threads/next-bp-other-thread.exp
+++ b/gdb/testsuite/gdb.threads/next-bp-other-thread.exp
@@ -20,7 +20,8 @@
 
 standard_testfile
 
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}] == -1} {
+if {[build_executable "failed to prepare" $testfile $srcfile \
+        {debug pthreads}] == -1} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.threads/signal-sigtrap.exp b/gdb/testsuite/gdb.threads/signal-sigtrap.exp
index 92488a50ac1bb7724d38a694620cad493d276077..f5dc7fe6e7406e447a3443243933ddc1e255be7e 100644 (file)
--- a/gdb/testsuite/gdb.threads/signal-sigtrap.exp
+++ b/gdb/testsuite/gdb.threads/signal-sigtrap.exp
@@ -23,7 +23,8 @@ if [target_info exists gdb,nosignals] {
     return -1
 }
 
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}]} {
+if {[build_executable "failed to prepare" $testfile $srcfile \
+        {debug pthreads}]} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.threads/step-bg-decr-pc-switch-thread.exp b/gdb/testsuite/gdb.threads/step-bg-decr-pc-switch-thread.exp
index 55ebd40c2e4c29ebbe2593ede9d4a0432d26f578..c6c6ccef0288c339419186e6bdffafc3f07b90d8 100644 (file)
--- a/gdb/testsuite/gdb.threads/step-bg-decr-pc-switch-thread.exp
+++ b/gdb/testsuite/gdb.threads/step-bg-decr-pc-switch-thread.exp
@@ -34,8 +34,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}
     return -1
 }
 
-clean_restart $binfile
-
 if ![runto_main] {
     continue
 }

diff --git a/gdb/testsuite/gdb.threads/tid-reuse.exp b/gdb/testsuite/gdb.threads/tid-reuse.exp
index 1d93a55e46c4ef91bfce1995e2803ebb5d6ca6c5..8ac1f5b2ceb92f9123a8ebbcf356bebdef2a39ac 100644 (file)
--- a/gdb/testsuite/gdb.threads/tid-reuse.exp
+++ b/gdb/testsuite/gdb.threads/tid-reuse.exp
@@ -22,8 +22,6 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile { debug pthreads
     return -1
 }
 
-clean_restart ${binfile}
-
 if ![runto_main] {
     fail "can't run to main"
     return -1

diff --git a/gdb/testsuite/gdb.trace/qtro.exp b/gdb/testsuite/gdb.trace/qtro.exp
index 91a6612fb10fa82ac6cc4293ce8de635c48fde6f..0fadfa66b13f15866ce691f7908ddbc8501d101a 100644 (file)
--- a/gdb/testsuite/gdb.trace/qtro.exp
+++ b/gdb/testsuite/gdb.trace/qtro.exp
@@ -25,7 +25,6 @@ standard_testfile
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nopie}]} {
     return -1
 }
-clean_restart $testfile
 
 if ![runto_main] {
     fail "can't run to main to check for trace support"