Hash :
7b142a7b
Author :
Date :
2012-05-15T16:12:09
tests: use 'parallel-tests' Automake option by default This will help our transition from 'serial-tests' to 'parallel-tests' as the default test suite driver enabled by a TESTS assignment in the input Makefile.am. Note that that change of default will only take place in master, though. * defs: Pass the 'parallel-tests' option to the AM_INIT_AUTOMAKE invocation in the created 'configure.ac' stub, unless the variable 'am_serial_tests' is set to "yes". Don't pay attention anymore to the 'am_parallel_tests' variable, that's obsolete now. * defs-static.in: Warn if the 'am_serial_tests' variable is set in the environment; conversely, don't warn anymore about 'am_parallel_tests' being set in the environment. * Makefile.am (AM_TESTS_ENVIRONMENT): Nullify the 'am_serial_tests' variable instead of the now-obsolete 'am_parallel_tests' one. * syntax-checks.mk (sc_tests_obsolete_variables): Also warn against uses of 'am_parallel_tests', which is now deprecated in favor of 'am_serial_tests'. Similarly, if a use of 'parallel_tests' is seen, suggest using 'am_serial_tests' instead, not 'am_parallel_tests'. * gen-testsuite-part: Now that we use the 'parallel-tests' by default in our tests, we need to completely change the logic and semantics of generation of sibling tests for those tests that check the Automake generated testsuite harness itself. Do that, and give a complete explanation of the new logic and semantics in the relevant comments. * t/README: Update. * Lots of test cases: Adjust. 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 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124
#! /bin/sh
# Copyright (C) 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 that $(am__make_dryrun) works as expected.
. ./defs || Exit 1
plan_ 14
if echo "all: ; @+printf %sbb%s aa cc" | $MAKE -n -f - | grep aabbcc; then
make_plus_silence () { return 0; }
else
make_plus_silence () { return 1; }
fi
mkdir sub
echo AC_OUTPUT >> configure.ac
cat > Makefile.am <<'END'
all:
: Dummy, nothing to do.
foo:
$(MAKE) all
notdry:
@echo ":: $$MAKEFLAGS ::"; : For debugging.
$(am__make_dryrun) && exit 1; exit 0
dry:
+@echo ":: $$MAKEFLAGS ::"; : For debugging.
+$(am__make_dryrun) || exit 1; echo ok > from-dry-mode
END
$ACLOCAL || fatal_ "aclocal failed"
$AUTOCONF || fatal_ "autoconf failed"
$AUTOMAKE || fatal_ "automake failed"
./configure || fatal_ "configure failed"
# ----------------------------------------------------------------------
check_no_dryrun ()
{
command_ok_ "dry-run ($cnt)" $MAKE notdry ${1+"$@"}
cnt=`expr $cnt + 1`
}
cnt=1
check_no_dryrun
# Test against a known regression. This was especially heinous, since
# make running in normal mode was sometimes mistaken for make running
# in dry mode.
check_no_dryrun TESTS="n1.test n2.test"
check_no_dryrun TESTS="n1 n2" AM_MAKEFLAGS="TESTS='n1 n2'"
check_no_dryrun TESTS="n1 n2" AM_MAKEFLAGS='TESTS="n1 n2"'
check_no_dryrun FOOFLAGS="-n -n -knf2 n --none -n"
check_no_dryrun MYFLAGS="-n --dryrun -n --dry-run -n"
# ----------------------------------------------------------------------
check_dryrun ()
{
r=ok directive=
case $1 in
-C) condition=$2 reason=$3; shift; shift; shift;;
*) condition=: reason=;;
esac
if $condition; then
$MAKE dry ${1+"$@"} || r='not ok'
test -f from-dry-mode || r='not ok'
rm -f from-dry-mode || fatal_ "cleaning up"
else
directive=SKIP
fi
result_ "$r" -D "$directive" -r "$reason" "not dry-run ($cnt)"
unset r directive reason
cnt=`expr $cnt + 1`
}
cnt=1
check_dryrun -C make_plus_silence 'recipe prefix "+" unsupported' -n
check_dryrun -C using_gmake "\$MAKE is not GNU make" --dry-run -k
# ----------------------------------------------------------------------
# Test for when shell metacharacters or backslashes are in $(MAKEFLAGS).
check_metachars ()
{
r=ok
$MAKE notdry ${1+"$@"} || r='not ok'
if test -f bad; then
r='not ok'
else
rm -f bad || fatal_ "cleaning up"
fi
result_ "$r" "dry-run, with shell metachars ($cnt)"
unset r
cnt=`expr $cnt + 1`
}
cnt=1
check_metachars MYFLAGS="-n \"n\" '-n' --none -n"
check_metachars MYFLAGS='-knf2\ n\ \\n'
check_metachars MYFLAGS="(&) | ; \" \` '"
check_metachars MYFLAGS=" ' # ' "
check_metachars MYFLAGS='$(foo)'
check_metachars MYFLAGS='`touch bad`'
# ----------------------------------------------------------------------
: