Combine inner testsuites used for testing runtest

9 files changed, 18 insertions, 69 deletions

diff --git a/testsuite/runtest.main/error.exp b/testsuite/runtest.main/error.exp
index 1473ee1..8d5795f 100644
--- a/testsuite/runtest.main/error.exp
+++ b/testsuite/runtest.main/error.exp
@@ -22,23 +22,7 @@
 
 load_lib util-defs.exp
 
-if {![info exists tmpdir]} {
-    set tmpdir [testsuite file -object -top tmpdir]
-}
-
-set fd [open error-init.exp w]
-puts $fd "set srcdir [testsuite file -source -test error]"
-puts $fd "set objdir [testsuite file -object -test error]"
-puts $fd "set tmpdir $tmpdir"
-close $fd
-
-if {![file isdirectory $tmpdir]} {
-    catch "file mkdir $tmpdir"
-}
-
-if {![file isdirectory [testsuite file -object -test error]]} {
-    catch {file mkdir [testsuite file -object -test error]}
-}
+runtest_setup_nested_testsuite
 
 set tests {
     { "run only simple test"
@@ -67,8 +51,8 @@ set tests {
 
 foreach t $tests {
     if [util_test $RUNTEST \
-	    "--local_init error-init.exp\
-		--outdir $tmpdir -a [lindex $t 1]" \
+	    "--local_init nested-init.exp --tool error\
+		-a [lindex $t 1]" \
 	    "" \
 	    [lindex $t 2]] {
 	fail [lindex $t 0]
@@ -77,5 +61,8 @@ foreach t $tests {
     }
 }
 
-file delete -force $tmpdir
-file delete -force [testsuite file -object -test error testsuite error.test lib]
+runtest_cleanup_nested_testsuite
+
+# remove the autoload files generated during the test
+file delete -force \
+    [testsuite file -object -test nested testsuite error.test lib]
diff --git a/testsuite/runtest.main/error/testsuite/error.test/error-al-dbz.exp b/testsuite/runtest.main/nested/testsuite/error.test/error-al-dbz.exp
index 52b5bc3..52b5bc3 100644
--- a/testsuite/runtest.main/error/testsuite/error.test/error-al-dbz.exp
+++ b/testsuite/runtest.main/nested/testsuite/error.test/error-al-dbz.exp
diff --git a/testsuite/runtest.main/error/testsuite/error.test/error-dbz.exp b/testsuite/runtest.main/nested/testsuite/error.test/error-dbz.exp
index 463337a..463337a 100644
--- a/testsuite/runtest.main/error/testsuite/error.test/error-dbz.exp
+++ b/testsuite/runtest.main/nested/testsuite/error.test/error-dbz.exp
diff --git a/testsuite/runtest.main/error/testsuite/error.test/error-undef.exp b/testsuite/runtest.main/nested/testsuite/error.test/error-undef.exp
index fa59f4a..fa59f4a 100644
--- a/testsuite/runtest.main/error/testsuite/error.test/error-undef.exp
+++ b/testsuite/runtest.main/nested/testsuite/error.test/error-undef.exp
diff --git a/testsuite/runtest.main/error/testsuite/error.test/simple.exp b/testsuite/runtest.main/nested/testsuite/error.test/simple.exp
index 93a03e7..93a03e7 100644
--- a/testsuite/runtest.main/error/testsuite/error.test/simple.exp
+++ b/testsuite/runtest.main/nested/testsuite/error.test/simple.exp
diff --git a/testsuite/runtest.main/options/testsuite/null.test/null.exp b/testsuite/runtest.main/nested/testsuite/null.test/null.exp
index f6f11af..f6f11af 100644
--- a/testsuite/runtest.main/options/testsuite/null.test/null.exp
+++ b/testsuite/runtest.main/nested/testsuite/null.test/null.exp
diff --git a/testsuite/runtest.main/stats/testsuite/stat.test/stats-sub.exp b/testsuite/runtest.main/nested/testsuite/stat.test/stats-sub.exp
index c797ad1..c797ad1 100644
--- a/testsuite/runtest.main/stats/testsuite/stat.test/stats-sub.exp
+++ b/testsuite/runtest.main/nested/testsuite/stat.test/stats-sub.exp
diff --git a/testsuite/runtest.main/options.exp b/testsuite/runtest.main/options.exp
index abbdc6a..2e2d81c 100644
--- a/testsuite/runtest.main/options.exp
+++ b/testsuite/runtest.main/options.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 1992-2016, 2018 Free Software Foundation, Inc.
+# Copyright (C) 1992-2016, 2018, 2020 Free Software Foundation, Inc.
 #
 # This file is part of DejaGnu.
 #
@@ -20,25 +20,7 @@
 
 load_lib util-defs.exp
 
-if {![info exists tmpdir]} {
-    set tmpdir [testsuite file -object -top tmpdir]
-}
-
-set fd [open options-init.exp w]
-puts $fd "set host_triplet $host_triplet"
-puts $fd "set srcdir [testsuite file -source -test options]"
-puts $fd "set objdir [testsuite file -object -test options]"
-puts $fd "set tmpdir $tmpdir"
-puts $fd "set outdir [testsuite file -object -test options]"
-close $fd
-
-if {![file isdirectory $tmpdir]} {
-    catch "file mkdir $tmpdir"
-}
-
-if {![file isdirectory [testsuite file -object -test options]]} {
-    catch {file mkdir [testsuite file -object -test options]}
-}
+runtest_setup_nested_testsuite
 
 #
 # Set up the list.
@@ -52,7 +34,7 @@ set tests {
     { "--help" "USAGE:*" "Display help" }
     { "-v -v -v" "Verbose level is 3" "Verbose set correctly" }
     { "-v --tool xXx"
-	"Found.*options-init\..*Loading.*utils\.exp"
+	"Found.*nested-init\..*Loading.*utils\.exp"
 	"Loading library files" }
     { "-v --tool xXx"
 	"Expect binary is.*Using.*main test driver"
@@ -112,7 +94,7 @@ set tests {
 
 foreach t $tests {
     if [util_test $RUNTEST \
-	    "[lindex $t 0] --local_init options-init.exp" \
+	    "[lindex $t 0] --local_init nested-init.exp --tool null" \
 	    "" \
 	    "[lindex $t 1]"] {
 	fail "[lindex $t 2]"
@@ -121,8 +103,4 @@ foreach t $tests {
     }
 }
 
-# clean up log files left by the child runtest
-foreach f [glob [testsuite file -object -test options *]] {
-    file delete $f
-}
-file delete -force $tmpdir
+runtest_cleanup_nested_testsuite
diff --git a/testsuite/runtest.main/stats.exp b/testsuite/runtest.main/stats.exp
index a81c8e6..39093ec 100644
--- a/testsuite/runtest.main/stats.exp
+++ b/testsuite/runtest.main/stats.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 1995-2016, 2018 Free Software Foundation, Inc.
+# Copyright (C) 1995-2016, 2018, 2020 Free Software Foundation, Inc.
 #
 # This file is part of DejaGnu.
 #
@@ -22,23 +22,7 @@
 
 load_lib util-defs.exp
 
-if {![info exists tmpdir]} {
-    set tmpdir [testsuite file -object -top tmpdir]
-}
-
-set fd [open stats-init.exp w]
-puts $fd "set srcdir [testsuite file -source -test stats]"
-puts $fd "set objdir [testsuite file -object -test stats]"
-puts $fd "set tmpdir $tmpdir"
-close $fd
-
-if {![file isdirectory $tmpdir]} {
-    catch "file mkdir $tmpdir"
-}
-
-if {![file isdirectory [testsuite file -object -test stats]]} {
-    catch {file mkdir [testsuite file -object -test stats]}
-}
+runtest_setup_nested_testsuite
 
 set tests {
     { pass "expected passes\[ \t\]+1\n" }
@@ -54,8 +38,8 @@ set tests {
 
 foreach t $tests {
     if [util_test $RUNTEST \
-	    "--local_init stats-init.exp\
-		--outdir $tmpdir STATS_TEST=[lindex $t 0] stats-sub.exp" \
+	    "--local_init nested-init.exp --tool stat\
+		STATS_TEST=[lindex $t 0] stats-sub.exp" \
 	    "" \
 	    [lindex $t 1]] {
 	fail [lindex $t 0]
@@ -64,4 +48,4 @@ foreach t $tests {
     }
 }
 
-file delete -force $tmpdir
+runtest_cleanup_nested_testsuite