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-more.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-more.sh')
-rwxr-xr-x | t/tap-more.sh | 162 |
1 files changed, 162 insertions, 0 deletions
diff --git a/t/tap-more.sh b/t/tap-more.sh new file mode 100755 index 000000000..6f5d5fe4b --- /dev/null +++ b/t/tap-more.sh @@ -0,0 +1,162 @@ +#! /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/>. + +# More on TAP support: +# - more than one TAP-generating test script in $(TESTS) +# - VPATH builds +# - use with parallel make (if supported) +# - basic use of diagnostic messages (lines beginning with "#") +# - flags for TAP driver defined through AC_SUBST in configure.ac +# - messages generated by the testsuite harness reference the +# correct test script(s) +# - "make distcheck" works + +am_parallel_tests=yes +. ./defs || Exit 1 + +fetch_tap_driver + +cat >> configure.ac <<END +AC_SUBST([AM_TEST_LOG_DRIVER_FLAGS], ['--comments']) +AC_OUTPUT +END + +cat > Makefile.am << 'END' +TEST_LOG_DRIVER = $(srcdir)/tap-driver +TESTS = 1.test 2.test 3.test +EXTRA_DIST = $(TESTS) tap-driver +END + +cat > 1.test <<'END' +#! /bin/sh +echo 1..2 +echo ok 1 - mu +if test -f not-skip; then + echo "not ok 2 zardoz" +else + echo "ok 2 zardoz # SKIP" +fi +END + +cat > 2.test <<'END' +#! /bin/sh +echo 1..3 +echo "ok" +echo "not ok # TODO not implemented" +echo "ok 3" +END + +cat > 3.test <<END +#! /bin/sh +echo 1..1 +echo ok - blah blah blah +echo '# Some diagnostic' +if test -f bail-out; then + echo 'Bail out! Kernel Panic' +else + : +fi +END + +chmod a+x [123].test + +$ACLOCAL +$AUTOCONF +$AUTOMAKE + +# Try a VPATH and by default serial build first, and then an in-tree +# and by default parallel build. +for try in 0 1; do + + if test $try -eq 0; then + # VPATH serial build. + mkdir build + cd build + srcdir=.. + run_make=$MAKE + elif test $try -eq 1; then + # In-tree parallel build. + srcdir=. + case $MAKE in + *\ -j*) + # Degree of parallelism already specified by the user: do + # not override it. + run_make=$MAKE + ;; + *) + # Some make implementations (e.g., HP-UX) don't grok '-j', + # some require no space between '-j' and the number of jobs + # (e.g., older GNU make versions), and some *do* require a + # space between '-j' and the number of jobs (e.g., Solaris + # dmake). We need a runtime test to see what works. + echo 'all:' > Makefile + for run_make in "$MAKE -j3" "$MAKE -j 3" "$MAKE"; do + $run_make && break + done + rm -f Makefile + ;; + esac + else + fatal_ "internal error, invalid value of '$try' for \$try" + fi + + $srcdir/configure + ls -l # For debugging. + + # Success. + + $run_make check >stdout || { cat stdout; Exit 1; } + cat stdout + count_test_results total=6 pass=4 fail=0 xpass=0 xfail=1 skip=1 error=0 + grep '^PASS: 1\.test 1 - mu$' stdout + grep '^SKIP: 1\.test 2 zardoz # SKIP$' stdout + test `$FGREP -c '1.test' stdout` -eq 2 + grep '^PASS: 2\.test 1$' stdout + grep '^XFAIL: 2\.test 2 # TODO not implemented$' stdout + grep '^PASS: 2\.test 3$' stdout + test `$FGREP -c '2.test' stdout` -eq 3 + grep '^PASS: 3\.test 1 - blah blah blah$' stdout + grep '^# 3\.test: Some diagnostic$' stdout + test `$FGREP -c '3.test' stdout` -eq 2 + + # Failure. + + # Use 'echo' here, since Solaris 10 /bin/sh would try to optimize + # a ':' away after the first iteration, even if it is redirected. + echo dummy > not-skip + echo dummy > bail-out + $run_make check >stdout && { cat stdout; Exit 1; } + cat stdout + count_test_results total=7 pass=4 fail=1 xpass=0 xfail=1 skip=0 error=1 + grep '^PASS: 1\.test 1 - mu$' stdout + grep '^FAIL: 1\.test 2 zardoz$' stdout + test `$FGREP -c '1.test' stdout` -eq 2 + grep '^PASS: 2\.test 1$' stdout + grep '^XFAIL: 2\.test 2 # TODO not implemented$' stdout + grep '^PASS: 2\.test 3$' stdout + test `$FGREP -c '2.test' stdout` -eq 3 + grep '^PASS: 3\.test 1 - blah blah blah$' stdout + grep '^# 3\.test: Some diagnostic$' stdout + grep '^ERROR: 3\.test - Bail out! Kernel Panic$' stdout + test `$FGREP -c '3.test' stdout` -eq 3 + + cd $srcdir + +done + +$MAKE distcheck + +: |