diff options
| author | Jacob Bachmeyer <jcb@gnu.org> | 2022-12-20 21:55:44 -0600 |
|---|---|---|
| committer | Jacob Bachmeyer <jcb@gnu.org> | 2022-12-20 21:55:44 -0600 |
| commit | 4d829912f7104d6f96886c1e46c173e9e7478946 (patch) | |
| tree | 7ef2ba3fa080a8df7c8e57f9fab005e5bf4a1759 /testsuite | |
| parent | 61273e9de56672a7fd665a328c9804de6cff9432 (diff) | |
| download | dejagnu-4d829912f7104d6f96886c1e46c173e9e7478946.zip dejagnu-4d829912f7104d6f96886c1e46c173e9e7478946.tar.gz dejagnu-4d829912f7104d6f96886c1e46c173e9e7478946.tar.bz2 | |
Add support for errors and warnings in the unit test protocol
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/runtest.main/nested/testsuite/stat.test/unit-sub.awk | 7 | ||||
| -rw-r--r-- | testsuite/runtest.main/nested/testsuite/stat.test/unit-sub.exp | 4 | ||||
| -rw-r--r-- | testsuite/runtest.main/stats.exp | 20 |
3 files changed, 28 insertions, 3 deletions
diff --git a/testsuite/runtest.main/nested/testsuite/stat.test/unit-sub.awk b/testsuite/runtest.main/nested/testsuite/stat.test/unit-sub.awk index 3b9a841..869244c 100644 --- a/testsuite/runtest.main/nested/testsuite/stat.test/unit-sub.awk +++ b/testsuite/runtest.main/nested/testsuite/stat.test/unit-sub.awk @@ -1,4 +1,4 @@ -# Copyright (C) 2020 Free Software Foundation, Inc. +# Copyright (C) 2020, 2022 Free Software Foundation, Inc. # # This file is part of DejaGnu. # @@ -22,6 +22,11 @@ BEGIN { } END { + for (i = 0; i < ECNT; i++) + print "\tERROR: sample error "i + for (i = 0; i < WCNT; i++) + print "\tWARNING: sample warning "i + if (UNIT_RESULT == "pass") print "\tPASSED: sample unit test" else if (UNIT_RESULT == "fail") diff --git a/testsuite/runtest.main/nested/testsuite/stat.test/unit-sub.exp b/testsuite/runtest.main/nested/testsuite/stat.test/unit-sub.exp index f3aece8..03ef4d5 100644 --- a/testsuite/runtest.main/nested/testsuite/stat.test/unit-sub.exp +++ b/testsuite/runtest.main/nested/testsuite/stat.test/unit-sub.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2020 Free Software Foundation, Inc. +# Copyright (C) 2020, 2022 Free Software Foundation, Inc. # # This file is part of DejaGnu. # @@ -22,7 +22,7 @@ load_lib dejagnu.exp if { [info exists STATS_TEST] } { host_execute [which awk] -f [testsuite file -source -test unit-sub.awk] \ - UNIT_RESULT=$STATS_TEST /dev/null + ECNT=$ERROR_COUNT WCNT=$WARNING_COUNT UNIT_RESULT=$STATS_TEST /dev/null } # Solaris 10 /usr/bin/awk needs /dev/null actually passed on the command # line, but will run unit-sub.awk without problems if that is done. diff --git a/testsuite/runtest.main/stats.exp b/testsuite/runtest.main/stats.exp index b2a578b..3f131d0 100644 --- a/testsuite/runtest.main/stats.exp +++ b/testsuite/runtest.main/stats.exp @@ -62,6 +62,26 @@ set tests { { unit 0 0 untested "untested testcases\[ \t\]+1\n" } { unit 0 0 unresolved "unresolved testcases\[ \t\]+1\n" } { unit 0 0 unsupported "unsupported tests\[ \t\]+1\n" } + + { unit 1 0 pass "unresolved testcases\[ \t\]+1\n" } + { unit 1 0 fail "unresolved testcases\[ \t\]+1\n" } + { unit 1 0 xpass "unresolved testcases\[ \t\]+1\n" } + { unit 1 0 xfail "unresolved testcases\[ \t\]+1\n" } + { unit 1 0 kpass "unresolved testcases\[ \t\]+1\n" } + { unit 1 0 kfail "unresolved testcases\[ \t\]+1\n" } + { unit 1 0 untested "unresolved testcases\[ \t\]+1\n" } + { unit 1 0 unresolved "unresolved testcases\[ \t\]+1\n" } + { unit 1 0 unsupported "unresolved testcases\[ \t\]+1\n" } + + { unit 0 4 pass "unresolved testcases\[ \t\]+1\n" } + { unit 0 4 fail "unresolved testcases\[ \t\]+1\n" } + { unit 0 4 xpass "unresolved testcases\[ \t\]+1\n" } + { unit 0 4 xfail "unresolved testcases\[ \t\]+1\n" } + { unit 0 4 kpass "unresolved testcases\[ \t\]+1\n" } + { unit 0 4 kfail "unresolved testcases\[ \t\]+1\n" } + { unit 0 4 untested "unresolved testcases\[ \t\]+1\n" } + { unit 0 4 unresolved "unresolved testcases\[ \t\]+1\n" } + { unit 0 4 unsupported "unresolved testcases\[ \t\]+1\n" } } foreach t $tests { |