-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Jacob Bachmeyer
committed
Nov 27, 2022
1 parent
c173c00
commit e8446c3
Showing
5 changed files
with
251 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,14 @@ | ||
| 2022-11-26 Jacob Bachmeyer <[email protected]> | ||
|
|
||
| * Makefile.in: Regenerate. | ||
| * Makefile.am (AM_CXXFLAGS): Change this... | ||
| (AM_CPPFLAGS): ...to this. (Also remove -g flag.) | ||
| (check_PROGRAMS): Add testsuite/libdejagnu/unit-c. | ||
| (testsuite_libdejagnu_unit_c_SOURCES): Add. | ||
| (TESTSUITE_FILES): Update. | ||
| * testsuite/libdejagnu/unit-c.c: New file. | ||
| * testsuite/libdejagnu/unit.exp: New file. | ||
|
|
||
| * dejagnu.h (xpass): Fix use of wrong counter. | ||
| (xfail): Likewise. | ||
| (totals): Report unexpected passes if any occurred. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* Exerciser for DejaGnu C unit test support library | ||
| * | ||
| * Copyright (C) 2022 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 was written by Jacob Bachmeyer. | ||
| */ | ||
|
|
||
| #include <stdio.h> | ||
| #include <stdlib.h> | ||
| #include <string.h> | ||
|
|
||
| #include "dejagnu.h" | ||
|
|
||
| int | ||
| main(int argc, char ** argv) | ||
| { | ||
| int i; | ||
|
|
||
| if (argc < 2) { | ||
| fprintf(stderr, | ||
| "usage: %s <test name>...\n see source for details\n", argv[0]); | ||
| return 2; | ||
| } | ||
|
|
||
| for (i = 1; i < argc; i++) { | ||
| if (!strcmp("pass", argv[i])) pass("test"); | ||
| else if (!strcmp("xpass", argv[i])) xpass("test"); | ||
| else if (!strcmp("fail", argv[i])) fail("test"); | ||
| else if (!strcmp("xfail", argv[i])) xfail("test"); | ||
| else if (!strcmp("untested", argv[i])) untested("test"); | ||
| else if (!strcmp("unresolved", argv[i])) unresolved("test"); | ||
| else if (!strcmp("note", argv[i])) note("test"); | ||
| else { | ||
| fprintf(stderr, "%s: unknown test `%s'\n", argv[0], argv[i]); | ||
| return 2; | ||
| } | ||
| } | ||
|
|
||
| totals(); | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| /* EOF */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| # Copyright (C) 2022 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 is a test driver for the unit test protocol library. | ||
|
|
||
| # Each test program must accept test outcomes on the command line, and | ||
| # produce exactly those results in that order. | ||
|
|
||
| proc test_libdejagnu_unit { language tests } { | ||
| set test_program [testsuite file -object -test "unit-${language}"] | ||
|
|
||
| # map messages from dejagnu.h:totals() to result types | ||
| array set expected_totals_map { | ||
| passed pass "real failed" fail | ||
| "unexpected passes" xpass | ||
| "expected failures" xfail | ||
| untested untested | ||
| unresolved unresolved | ||
| } | ||
|
|
||
| foreach test $tests { | ||
| array set expected_totals { | ||
| pass 0 fail 0 | ||
| xpass 0 xfail 0 | ||
| untested 0 unresolved 0 | ||
| } | ||
| set test_idx 0 | ||
| set result pass | ||
|
|
||
| verbose -log "Spawning $test_program $test ..." | ||
| eval [list spawn $test_program] $test | ||
|
|
||
| expect_after { | ||
| -re {^[^\n]*\n} { exp_continue } | ||
| full_buffer { | ||
| perror "Expect matching buffer overrun during test." | ||
| } | ||
| eof { | ||
| # No end marker? -> Fail! | ||
| verbose -log " unit test did not emit an end marker" | ||
| set result fail | ||
| } | ||
| timeout { | ||
| catch close | ||
| set result unresolved | ||
| } | ||
| } | ||
|
|
||
| # Check that the reported results match. | ||
| expect { | ||
| -re {^[\r\n]*Totals:[\r\n]+} { | ||
| # done with results, but fail if there should be more | ||
| if { [lindex $test $test_idx] ne "" } { | ||
| verbose -log " expected [lindex $test $test_idx]" | ||
| set result fail | ||
| } | ||
| } | ||
| -re {(?:\A|\n)\t([][[:upper:]]+):([^\n]+)\n} { | ||
| # above pattern copied from lib/dejagnu.exp:host_execute | ||
| switch -- [lindex $test $test_idx] { | ||
| pass { set expected PASSED } | ||
| fail { set expected FAILED } | ||
| xpass { set expected XPASSED } | ||
| xfail { set expected XFAILED } | ||
| untested { set expected UNTESTED } | ||
| unresolved { set expected UNRESOLVED } | ||
| } | ||
| if { [info exists expected_totals([lindex $test $test_idx])]} { | ||
| incr expected_totals([lindex $test $test_idx]) | ||
| } | ||
| if { $expected ne $expect_out(1,string) } { | ||
| set result fail | ||
| } | ||
| incr test_idx | ||
| exp_continue | ||
| } | ||
| } | ||
| # Now ensure that the reported totals are as expected. | ||
| expect { | ||
| -re {^\n*\t#([^:]+):\t+([[:digit:]]+)\r*\n} { | ||
| set type $expected_totals_map($expect_out(1,string)) | ||
| set count $expect_out(2,string) | ||
|
|
||
| if { $expected_totals($type) != $count } { | ||
| verbose -log " expected $expected_totals($type)\ | ||
| $type; got $count" | ||
| set result fail | ||
| } | ||
| unset expected_totals($type) | ||
| exp_continue | ||
| } | ||
| -re {^\n*\tEND:[^\n]+\n} { | ||
| # flush to EOF | ||
| expect -re {.+} { exp_continue } eof | ||
| } | ||
| } | ||
| catch close | ||
| wait -nowait | ||
|
|
||
| foreach { type count } [array get expected_totals] { | ||
| if { $count == 0 } { continue } | ||
| verbose -log " expected $count $type; got no report" | ||
| set result fail | ||
| } | ||
|
|
||
| $result "test $test_program with: $test" | ||
| } | ||
| } | ||
|
|
||
| test_libdejagnu_unit c { | ||
| pass fail xpass xfail untested unresolved | ||
| } |