diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-06 13:12:25 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-06 21:29:30 +0200 |
commit | 8a5096d150cf9803b8963768b7366cd68edcce03 (patch) | |
tree | a49c0e54876b8b9877d7ca2df386377e7b6037d1 /t/tap-todo-skip-whitespace.sh | |
parent | f8e822bbc197f01fc722aa6def7cddb4182e3c66 (diff) | |
download | automake-8a5096d150cf9803b8963768b7366cd68edcce03.tar.gz |
tests: rename 'tests/' => 't/', '*.test' => '*.sh'
When we (soon) convert the Automake testsuite to a non-recursive
make setup, we'll have to fix the entries of $(TESTS) to be
prepended with the subdirectory they are in; this will increase
the length of $(TESTS), and thus increase the possibility of
exceeding the command-line length limits on some systems (most
notably, MinGW/MSYS). See automake bug#7868 for more information.
Thus we rename the 'tests/' subdirectory to 't/', and each 'x.test'
script in there to 'x.sh'; this way, the $(TESTS) entry 'foo.test'
will become 't/foo.sh', which have the same number of characters.
* tests/: Rename ...
* t/: ... to this.
* t/*.test: Rename ...
* t/*.sh: ... to this.
* t/.gitignore: Removed as obsolete.
* t/defs: Adjust.
* t/gen-testsuite-part: Likewise.
* t/list-of-tests.mk: Likewise.
* t/ccnoco.sh: Likewise.
* t/ccnoco3.sh: Likewise.
* t/self-check-cleanup.tap: Likewise.
* t/self-check-dir.tap: Likewise.
* t/self-check-me.tap: Likewise.
* t/self-check-reexec.tap: Likewise.
* README: Likewise.
* bootstrap: Likewise
* configure.ac: Likewise.
* Makefile.am: Likewise.
* .gitignore: Likewise.
* syntax-check.mk: Likewise.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/tap-todo-skip-whitespace.sh')
-rwxr-xr-x | t/tap-todo-skip-whitespace.sh | 100 |
1 files changed, 100 insertions, 0 deletions
diff --git a/t/tap-todo-skip-whitespace.sh b/t/tap-todo-skip-whitespace.sh new file mode 100755 index 000000000..9d7afb962 --- /dev/null +++ b/t/tap-todo-skip-whitespace.sh @@ -0,0 +1,100 @@ +#! /bin/sh +# Copyright (C) 2011-2012 Free Software Foundation, Inc. +# +# This program 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 2, or (at your option) +# any later version. +# +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. + +# TAP support: +# - normalization of whitespace in console testsuite progress associated +# with TODO and SKIP directives + +am_parallel_tests=yes +. ./defs || Exit 1 + +. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" + +cat > stub.tap <<END +1 # TODO +2 # TODO foo? +3 # TODO: bar! +4 aa # TODO +5 bb # TODO fnord 5 +6 cc # TODO:${tab}fnord 6 +7 - x # TODO +8 - y # TODO fnord $tab 8 +9 - z # TODO: fnord 9 $tab +10# TODO x0 +11$tab# TODO x1 +12 $tab$tab # TODO x2 +13 asd# TODO x3 +14 sad$tab# TODO x4 +15 das$tab$tab # TODO x5 +END + +cat > stub.exp <<END +1 # TODO +2 # TODO foo? +3 # TODO: bar! +4 aa # TODO +5 bb # TODO fnord 5 +6 cc # TODO:${tab}fnord 6 +7 - x # TODO +8 - y # TODO fnord $tab 8 +9 - z # TODO: fnord 9 +10 # TODO x0 +11 # TODO x1 +12 # TODO x2 +13 asd # TODO x3 +14 sad # TODO x4 +15 das # TODO x5 +END + +plan=1..15 + +my_make_check () +{ + xpass=0 xfail=0 skip=0 + case $1 in + xpass|xfail|skip) eval $1=15;; + *) fatal_ "bad argument '$1' for my_make_check";; + esac + cat all.test + $MAKE check >stdout || : # Don't care about the exit status in this test. + cat stdout + count_test_results total=15 pass=0 fail=0 error=0 \ + xpass=$xpass xfail=$xfail skip=$skip + # Don't be too strict w.r.t. possible normalization of "TODO: foo" into + # "TODO : foo" (as is done by, e.g., the 'TAP::Parser' perl module). + LC_ALL=C grep '^[A-Z][A-Z]*:' stdout \ + | sed -e 's/# TODO *:/# TODO:/' -e 's/# SKIP *:/# SKIP:/' > got + cat exp + cat got + diff exp got +} + +# For "TODO" directives leading to XPASS results. +(echo $plan && sed -e 's/^/ok /' stub.tap) > all.test +sed -e 's/^/XPASS: all.test /' stub.exp > exp +my_make_check xpass + +# For "TODO" directives leading to XFAIL results. +(echo $plan && sed -e 's/^/not ok /' stub.tap) > all.test +sed -e 's/^/XFAIL: all.test /' stub.exp > exp +my_make_check xfail + +# For "SKIP" directives. +(echo $plan && sed -e 's/^/ok /' -e 's/TODO/SKIP/' stub.tap) > all.test +sed -e 's/TODO/SKIP/' -e 's/^/SKIP: all.test /' stub.exp > exp +my_make_check skip + +: |