Withdraw proposed --keep_going and --no_keep_going options

6 files changed, 84 insertions, 104 deletions

diff --git a/testsuite/runtest.main/abort.exp b/testsuite/runtest.main/abort.exp
deleted file mode 100644
index 4ec0dc2..0000000
--- a/testsuite/runtest.main/abort.exp
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright (C) 1995-2016, 2018, 2020 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This file tests handling of fatal errors in testcases.
-# The way we do this is to recursively invoke ourselves on a small testsuite
-# and analyze the results.
-
-load_lib util-defs.exp
-
-if {![info exists tmpdir]} {
-    set tmpdir [testsuite file -object -top tmpdir]
-}
-
-set fd [open abort-init.exp w]
-puts $fd "set srcdir [testsuite file -source -test abort]"
-puts $fd "set objdir [testsuite file -object -test abort]"
-puts $fd "set tmpdir $tmpdir"
-close $fd
-
-if {![file isdirectory $tmpdir]} {
-    catch "file mkdir $tmpdir"
-}
-
-if {![file isdirectory [testsuite file -object -test abort]]} {
-    catch {file mkdir [testsuite file -object -test abort]}
-}
-
-set tests {
-    { "run only simple test"
-	"simple.exp"
-	"PASS: simple test.*\
-	*expected passes\[ \t\]+1\n" }
-    { "abort on undefined command with --no_keep_going"
-	"--no_keep_going abort-undef.exp"
-	"PASS: running abort-undef.exp.*\
-	*UNRESOLVED: .* aborted.*\
-	*expected passes\[ \t\]+1\n.*unresolved testcases\[ \t\]+1\n" }
-    { "stop at divide-by-zero with --no_keep_going"
-	"--no_keep_going abort-dbz.exp simple.exp"
-	"PASS: running abort-dbz.exp.*\
-	*UNRESOLVED: .* aborted.*\
-	*expected passes\[ \t\]+1\n.*unresolved testcases\[ \t\]+1\n" }
-    { "continue after divide-by-zero with --keep_going"
-	"--keep_going abort-dbz.exp simple.exp"
-	"PASS: running abort-dbz.exp.*\
-	*UNRESOLVED: .* aborted.*\
-	*PASS: simple test.*\
-	*expected passes\[ \t\]+2\n" }
-    { "stop at auto-loaded divide-by-zero with --no_keep_going"
-	"--no_keep_going abort-al-dbz.exp simple.exp"
-	"PASS: running abort-al-dbz.exp.*\
-	*UNRESOLVED: .* aborted.*\
-	*expected passes\[ \t\]+1\n.*unresolved testcases\[ \t\]+1\n" }
-    { "continue after auto-loaded divide-by-zero with --keep_going"
-	"--keep_going abort-al-dbz.exp simple.exp"
-	"PASS: running abort-al-dbz.exp.*\
-	*UNRESOLVED: .* aborted.*\
-	*PASS: simple test.*\
-	*expected passes\[ \t\]+2\n" }
-    { "stop at abort with --no_keep_going"
-	"--no_keep_going abort-undef.exp simple.exp"
-	"PASS: running abort-undef.exp.*\
-	*UNRESOLVED: .* aborted.*\
-	*expected passes\[ \t\]+1\n.*unresolved testcases\[ \t\]+1\n" }
-    { "continue after abort with --keep_going"
-	"--keep_going abort-undef.exp simple.exp"
-	"PASS: running abort-undef.exp.*\
-	*UNRESOLVED: .* aborted.*\
-	*PASS: simple test.*\
-	*expected passes\[ \t\]+2\n.*unresolved testcases\[ \t\]+1\n" }
-}
-
-foreach t $tests {
-    if [util_test $RUNTEST \
-	    "--local_init abort-init.exp\
-		--outdir $tmpdir -a [lindex $t 1]" \
-	    "" \
-	    [lindex $t 2]] {
-	fail [lindex $t 0]
-    } else {
-	pass [lindex $t 0]
-    }
-}
-
-file delete -force $tmpdir
-file delete -force [testsuite file -object -test abort testsuite abort.test lib]
diff --git a/testsuite/runtest.main/error.exp b/testsuite/runtest.main/error.exp
new file mode 100644
index 0000000..1473ee1
--- /dev/null
+++ b/testsuite/runtest.main/error.exp
@@ -0,0 +1,81 @@
+# Copyright (C) 1995-2016, 2018, 2020 Free Software Foundation, Inc.
+#
+# This file is part of DejaGnu.
+#
+# DejaGnu is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# DejaGnu is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with DejaGnu; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+
+# This file tests handling of fatal errors in testcases.
+# The way we do this is to recursively invoke ourselves on a small testsuite
+# and analyze the results.
+
+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]}
+}
+
+set tests {
+    { "run only simple test"
+	"simple.exp"
+	"PASS: simple test.*\
+	*expected passes\[ \t\]+1\n" }
+    { "continue after divide-by-zero, reporting error"
+	"error-dbz.exp simple.exp"
+	"PASS: running error-dbz.exp.*\
+	*UNRESOLVED: .* aborted.*\
+	*PASS: simple test.*\
+	*expected passes\[ \t\]+2\n.*unresolved testcases\[ \t\]+1\n" }
+    { "continue after auto-loaded divide-by-zero, reporting error"
+	"error-al-dbz.exp simple.exp"
+	"PASS: running error-al-dbz.exp.*\
+	*UNRESOLVED: .* aborted.*\
+	*PASS: simple test.*\
+	*expected passes\[ \t\]+2\n.*unresolved testcases\[ \t\]+1\n" }
+    { "continue after calling undefined procedure, reporting error"
+	"error-undef.exp simple.exp"
+	"PASS: running error-undef.exp.*\
+	*UNRESOLVED: .* aborted.*\
+	*PASS: simple test.*\
+	*expected passes\[ \t\]+2\n.*unresolved testcases\[ \t\]+1\n" }
+}
+
+foreach t $tests {
+    if [util_test $RUNTEST \
+	    "--local_init error-init.exp\
+		--outdir $tmpdir -a [lindex $t 1]" \
+	    "" \
+	    [lindex $t 2]] {
+	fail [lindex $t 0]
+    } else {
+	pass [lindex $t 0]
+    }
+}
+
+file delete -force $tmpdir
+file delete -force [testsuite file -object -test error testsuite error.test lib]
diff --git a/testsuite/runtest.main/abort/testsuite/abort.test/abort-al-dbz.exp b/testsuite/runtest.main/error/testsuite/error.test/error-al-dbz.exp
index df55a9a..52b5bc3 100644
--- a/testsuite/runtest.main/abort/testsuite/abort.test/abort-al-dbz.exp
+++ b/testsuite/runtest.main/error/testsuite/error.test/error-al-dbz.exp
@@ -18,7 +18,7 @@
 
 # Cause a divide-by-zero error in an auto-loaded procedure.
 
-pass "running abort-al-dbz.exp"
+pass "running error-al-dbz.exp"
 
 set fd [open [testsuite file -object -test lib foo.tcl] w]
 puts $fd {proc throw_arith_error_div_by_zero { } {
diff --git a/testsuite/runtest.main/abort/testsuite/abort.test/abort-dbz.exp b/testsuite/runtest.main/error/testsuite/error.test/error-dbz.exp
index 711347d..463337a 100644
--- a/testsuite/runtest.main/abort/testsuite/abort.test/abort-dbz.exp
+++ b/testsuite/runtest.main/error/testsuite/error.test/error-dbz.exp
@@ -18,7 +18,7 @@
 
 # Cause a divide-by-zero error.
 
-pass "running abort-dbz.exp"
+pass "running error-dbz.exp"
 
 proc throw_arith_error_div_by_zero { } {
     expr { 1 / 0 }
diff --git a/testsuite/runtest.main/abort/testsuite/abort.test/abort-undef.exp b/testsuite/runtest.main/error/testsuite/error.test/error-undef.exp
index e5f4803..fa59f4a 100644
--- a/testsuite/runtest.main/abort/testsuite/abort.test/abort-undef.exp
+++ b/testsuite/runtest.main/error/testsuite/error.test/error-undef.exp
@@ -18,7 +18,7 @@
 
 # Invoke an undefined command, causing a fatal error.
 
-pass "running abort-undef.exp"
+pass "running error-undef.exp"
 
 bogus_command 1 2 3 4
 
diff --git a/testsuite/runtest.main/abort/testsuite/abort.test/simple.exp b/testsuite/runtest.main/error/testsuite/error.test/simple.exp
index 93a03e7..93a03e7 100644
--- a/testsuite/runtest.main/abort/testsuite/abort.test/simple.exp
+++ b/testsuite/runtest.main/error/testsuite/error.test/simple.exp