diff options
author | Jacob Bachmeyer <jcb62281+dev@gmail.com> | 2020-06-17 18:08:57 -0500 |
---|---|---|
committer | Jacob Bachmeyer <jcb62281+dev@gmail.com> | 2020-06-17 18:08:57 -0500 |
commit | c5b21f1f1cfaabf1431010c314aadcc0b7b708f0 (patch) | |
tree | 8318189e0992ad9a8136458b4dae5aa080fb0ee1 /testsuite | |
parent | 5fafcd43b2d22b2227e62f7278584418c6449824 (diff) | |
download | dejagnu-c5b21f1f1cfaabf1431010c314aadcc0b7b708f0.zip dejagnu-c5b21f1f1cfaabf1431010c314aadcc0b7b708f0.tar.gz dejagnu-c5b21f1f1cfaabf1431010c314aadcc0b7b708f0.tar.bz2 |
Allow testing to continue after an undefined command is called
Diffstat (limited to 'testsuite')
-rw-r--r-- | testsuite/runtest.main/abort.exp | 78 | ||||
-rw-r--r-- | testsuite/runtest.main/abort/testsuite/abort.test/abort-undef.exp | 25 | ||||
-rw-r--r-- | testsuite/runtest.main/abort/testsuite/abort.test/simple.exp | 21 |
3 files changed, 124 insertions, 0 deletions
diff --git a/testsuite/runtest.main/abort.exp b/testsuite/runtest.main/abort.exp new file mode 100644 index 0000000..c5f7014 --- /dev/null +++ b/testsuite/runtest.main/abort.exp @@ -0,0 +1,78 @@ +# 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" + "abort-undef.exp" + "PASS: running abort-undef.exp.*\ + *UNRESOLVED: .* aborted at call to unknown command.*\ + *expected passes\[ \t\]+1\n.*unresolved testcases\[ \t\]+1\n" } + { "stop at abort without --keep_going" + "abort-undef.exp simple.exp" + "PASS: running abort-undef.exp.*\ + *UNRESOLVED: .* aborted at call to unknown command.*\ + *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 at call to unknown command.*\ + *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 diff --git a/testsuite/runtest.main/abort/testsuite/abort.test/abort-undef.exp b/testsuite/runtest.main/abort/testsuite/abort.test/abort-undef.exp new file mode 100644 index 0000000..e5f4803 --- /dev/null +++ b/testsuite/runtest.main/abort/testsuite/abort.test/abort-undef.exp @@ -0,0 +1,25 @@ +# Copyright (C) 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. + +# Invoke an undefined command, causing a fatal error. + +pass "running abort-undef.exp" + +bogus_command 1 2 3 4 + +fail "script did not abort" diff --git a/testsuite/runtest.main/abort/testsuite/abort.test/simple.exp b/testsuite/runtest.main/abort/testsuite/abort.test/simple.exp new file mode 100644 index 0000000..93a03e7 --- /dev/null +++ b/testsuite/runtest.main/abort/testsuite/abort.test/simple.exp @@ -0,0 +1,21 @@ +# Copyright (C) 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. + +# Return a passing result + +pass "simple test" |