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
#! /bin/sh
# Copyright (C) 2008-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/>.
# Check @substituted@ TESTS, some of which are also PROGRAMS.
# See also sister test 'check-subst.sh'.
# For gen-testsuite-part: ==> try-with-serial-tests <==
required='cc native'
. test-init.sh
cat >> configure.ac << 'END'
AC_PROG_CC
AC_SUBST([script_tests],
['subst-pass-script.test subst-xfail-script.test'])
AC_SUBST([prog_tests],
['subst-pass-prog.test$(EXEEXT) subst-xfail-prog.test$(EXEEXT)'])
AC_SUBST([xfail_tests],
['xfail-script.test subst-xfail-script.test]dnl
[ xfail-prog$(EXEEXT) subst-xfail-prog.test$(EXEEXT)'])
AC_OUTPUT
END
cat > Makefile.am << 'END'
TESTS = pass-script.test xfail-script.test @script_tests@ $(check_PROGRAMS)
XFAIL_TESTS = @xfail_tests@
check_PROGRAMS = pass-prog xfail-prog @prog_tests@
EXTRA_PROGRAMS = subst-pass-prog.test subst-xfail-prog.test
END
cat > pass-script.test <<'END'
#! /bin/sh
exit 0
END
cat > xfail-script.test <<'END'
#! /bin/sh
exit 1
END
chmod a+x pass-script.test xfail-script.test
cp pass-script.test subst-pass-script.test
cp xfail-script.test subst-xfail-script.test
cat > pass-prog.c <<'END'
int main (void) { return 0; }
END
cat > xfail-prog.c <<'END'
#include <stdlib.h>
int main (void) { return EXIT_FAILURE; }
END
# The .test extension is removed for the default source file name:
cp pass-prog.c subst-pass-prog.c
cp xfail-prog.c subst-xfail-prog.c
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
./configure
$MAKE all
$MAKE check
$MAKE distclean
mkdir build
cd build
../configure
$MAKE all
$MAKE check
$MAKE distclean
: