Hash :
5ddf1007
Author :
Date :
2012-10-27T16:41:39
tests: prefer including 'test-init.sh' rather than './defs'
This is a follow-up to today's commit v1.12.4-22-g0610fc8,
"tests: prepare to move ./defs to t/ax/test-init.sh"
* All tests: To run the common setup, use the command:
. test-init.sh
instead of the older, "historical" one:
. ./defs || exit 1
Note that the "|| exit 1" wasn't really useful, since the 'errexit'
shell flag is in effect in both './defs' and 'test-init.sh', and all
the known shells that are good enough to run the automake testsuite
do automatically exit with error when a sourced file cannot be found
(at least, they do so in non-interactive mode, which is the only
mode that concerns us in the testsuite).
* t/ax/tap-summary-aux.sh, t/ax/testsuite-summary-checks.sh: Likewise.
* gen-testsuite-part: Do the same in the generated tests.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93
#! /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:
# - option '--diagnostic-string' to customize the string introducing
# TAP diagnostics
. test-init.sh
fetch_tap_driver
cat >> configure.ac <<END
AC_OUTPUT
END
cat > Makefile.am << 'END'
my_log_driver = $(srcdir)/tap-driver
my_log_compiler = cat
TEST_EXTENSIONS =
TESTS =
END
: > later.mk
# Quoting our comments below is an hack required to keep
# comments near the things they refer to.
i=0
for string in \
'## A letter' \
a \
'## A number' \
1023 \
'## A non-alphabetic character' \
@ \
'## Some metacharacters (we need to repeat the "$" for make)' \
'^>;&*"|$$' \
'## A whitespace character' \
" " \
'## A tab character' \
"$tab" \
'## A string with more whitespace' \
" ${tab}a b${tab} c" \
'## Note the we do not have the empty string here. We prefer to' \
'## leave its behaviour in this context undefined for the moment.'
do
case $string in '##'*) continue;; esac
i=$(($i + 1))
unindent >> Makefile.am << END
TEST_EXTENSIONS += .t$i
TESTS += foo$i.t$i
T${i}_LOG_COMPILER = \$(my_log_compiler)
T${i}_LOG_DRIVER = \$(my_log_driver)
AM_T${i}_LOG_DRIVER_FLAGS = \
--comments \
--diagnostic-string '$string'
END
unindent > foo$i.t$i <<END
1..1
ok 1
$string blah blah $i
END
echo "AM_T${i}_LOG_DRIVER_FLAGS = --no-comments" >> later.mk
done
$ACLOCAL
$AUTOCONF
$AUTOMAKE
./configure
$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=$i pass=$i fail=0 xpass=0 xfail=0 skip=0 error=0
cat later.mk >> Makefile
$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
$FGREP 'blah blah' stdout && exit 1
: