prepare_for_testing, standardize

6 files changed, 6 insertions, 11 deletions

diff --git a/gdb/testsuite/gdb.twreverse/break-reverse.exp b/gdb/testsuite/gdb.twreverse/break-reverse.exp
index 902a1243f97..8e1aead94b0 100644
--- a/gdb/testsuite/gdb.twreverse/break-reverse.exp
+++ b/gdb/testsuite/gdb.twreverse/break-reverse.exp
@@ -16,8 +16,7 @@
 set testfile "break-reverse"
 set srcfile  ${testfile}.c
 
-if { [prepare_for_testing break-reverse.exp $testfile $srcfile] } {
-    untested break-reverse.exp
+if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.twreverse/consecutive-reverse.exp b/gdb/testsuite/gdb.twreverse/consecutive-reverse.exp
index 96db3fc606a..0d5da8303ad 100644
--- a/gdb/testsuite/gdb.twreverse/consecutive-reverse.exp
+++ b/gdb/testsuite/gdb.twreverse/consecutive-reverse.exp
@@ -26,8 +26,7 @@ set testfile "consecutive-reverse"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
-if { [prepare_for_testing ${testfile}.exp $testfile $srcfile] } {
-    untested "${testfile}.exp"
+if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.twreverse/finish-reverse.exp b/gdb/testsuite/gdb.twreverse/finish-reverse.exp
index 00ae612f231..2bfa99fbb5e 100644
--- a/gdb/testsuite/gdb.twreverse/finish-reverse.exp
+++ b/gdb/testsuite/gdb.twreverse/finish-reverse.exp
@@ -19,8 +19,7 @@
 set testfile "finish-reverse"
 set srcfile ${testfile}.c
 
-if { [prepare_for_testing return2-reverse.exp "$testfile" $srcfile] } {
-    untested finish-reverse.exp
+if { [prepare_for_testing $testfile.exp "$testfile" $srcfile] } {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.twreverse/machinestate.exp b/gdb/testsuite/gdb.twreverse/machinestate.exp
index 0a9d145969f..3b4b0f63d3d 100644
--- a/gdb/testsuite/gdb.twreverse/machinestate.exp
+++ b/gdb/testsuite/gdb.twreverse/machinestate.exp
@@ -42,7 +42,7 @@ set testfile "machinestate"
 set srcfile  ${testfile}.c
 set srcfile1 ${testfile}1.c
 
-if { [prepare_for_testing machinestate.exp $testfile {machinestate.c machinestate1.c} ] } {
+if { [prepare_for_testing $testfile.exp $testfile {machinestate.c machinestate1.c} ] } {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.twreverse/step-reverse.exp b/gdb/testsuite/gdb.twreverse/step-reverse.exp
index 9fd9aebab7a..addc2c8f826 100644
--- a/gdb/testsuite/gdb.twreverse/step-reverse.exp
+++ b/gdb/testsuite/gdb.twreverse/step-reverse.exp
@@ -20,8 +20,7 @@
 set testfile "step-reverse"
 set srcfile  ${testfile}.c
 
-if { [prepare_for_testing step-reverse.exp $testfile $srcfile] } {
-    untested step-reverse.exp
+if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.twreverse/watch-reverse.exp b/gdb/testsuite/gdb.twreverse/watch-reverse.exp
index 25843e068ff..5f0beed64b8 100644
--- a/gdb/testsuite/gdb.twreverse/watch-reverse.exp
+++ b/gdb/testsuite/gdb.twreverse/watch-reverse.exp
@@ -24,8 +24,7 @@ set binfile ${objdir}/${subdir}/${testfile}
 
 set wp_set 1
 
-if { [prepare_for_testing watch-reverse.exp $testfile $srcfile] } {
-    untested watch-reverse.exp
+if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
     return -1
 }