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 94 95 96 97
#! /bin/sh
# Copyright (C) 2003-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/>.
# Test AM_MISSING_PROG.
. test-init.sh
cat >> configure.ac <<'END'
AM_MISSING_PROG([NO_SUCH_COMMAND], [am-none-none])
AM_MISSING_PROG([MISMATCHED_COMMAND], [am-exit-63])
AM_MISSING_PROG([OVERRIDDEN_COMMAND], [am-none-none])
AM_MISSING_PROG([COMMAND_FOUND], [my-command])
AC_OUTPUT
END
mkdir bin
cat > bin/am-exit-63 <<'END'
#!/bin/sh
echo "Oops, I'm too old"
exit 63
END
cat > bin/am-overridden <<'END'
#!/bin/sh
echo "Hey, I'm OK!"
exit 0
END
cat > bin/my-command <<'END'
#!/bin/sh
echo SNAFU
exit 0
END
chmod a+x bin/*
PATH=$(pwd)/bin$PATH_SEPARATOR$PATH; export PATH
cat > Makefile.am <<'END'
# Different for different targets, for the sake of parallel make.
o = $@-stdout
e = $@-stderr
debug_info = grep . $@-stdout $@-stderr
status_is = $(debug_info); echo $@: st=$$st; test $$st -eq
w_mis = 'am-none-none' is needed, and is missing on your system
w_old = 'am-exit-63' is needed, and is probably too old
test1:
st=0; $(NO_SUCH_COMMAND) >$o 2>$e || st=$$?; $(status_is) 127
grep "^WARNING: $(w_mis)" $e
test ! -s $o
test2:
st=0; $(MISMATCHED_COMMAND) >$o 2>$e || st=$$?; $(status_is) 63
grep "^WARNING: $(w_old)" $e
test "`cat $o`" = "Oops, I'm too old"
test3:
st=0; $(OVERRIDDEN_COMMAND) >$o 2>$e || st=$$?; $(status_is) 0
st=0; $(OVERRIDDEN_COMMAND) >$o 2>$e || st=$$?; \
test ! -s $e
test "`cat $o`" = "Hey, I'm OK!"
test4:
st=0; $(COMMAND_FOUND) >$o 2>$e || st=$$?; $(status_is) 0
test ! -s $e
test "`cat $o`" = SNAFU
check-local: test1 test2 test2 test4
.PHONY: test1 test2 test2 test4
CLEANFILES = test[1234]-stdout test[1234]-stderr
END
$ACLOCAL
$AUTOCONF
$AUTOMAKE
./configure OVERRIDDEN_COMMAND=am-overridden
$FGREP COMMAND Makefile.in Makefile # For debugging.
grep "^NO_SUCH_COMMAND = \${SHELL} .*/missing .*am-none-none" Makefile
grep "^MISMATCHED_COMMAND = \${SHELL} .*/missing .*am-exit-63" Makefile
grep "^COMMAND_FOUND = \${SHELL} .*/missing .*my-command" Makefile
grep '^OVERRIDDEN_COMMAND = am-overridden *$' Makefile
$MAKE test1 test2 test3 test4
$MAKE distcheck DISTCHECK_CONFIGURE_FLAGS='OVERRIDDEN_COMMAND=am-overridden'
: