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 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143
#! /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/>.
# Custom test drivers: per-extension test drivers.
. ./defs || Exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
END
cat > Makefile.am << 'END'
# Automake shouldn't match the '/test' in 'sub/test' as '.test' suffix.
TESTS = 1.chk 2.test 3 4.c.chk 5.suf sub/test
TEST_EXTENSIONS = .chk .test
CHK_LOG_DRIVER = ./chk-wrapper
TEST_LOG_DRIVER = $(SHELL) $(srcdir)/test-wrapper
LOG_DRIVER = noext-wrapper
AM_CHK_LOG_DRIVER_FLAGS = --am-chk
CHK_LOG_DRIVER_FLAGS = --chk
AM_TEST_LOG_DRIVER_FLAGS = -am-test
TEST_LOG_DRIVER_FLAGS = -test
AM_LOG_DRIVER_FLAGS = am
LOG_DRIVER_FLAGS = _
END
mkdir sub bin
PATH=`pwd`/bin$PATH_SEPARATOR$PATH; export PATH
cat > wrapper.skel <<'END'
#! /bin/sh
set -e
me=`echo "$0" | sed 's,^.*/,,'`
if test -z "$me"; then
echo "$0: cannot determine program name" >&2
exit 99
fi
am_log_wflags='@am_log_wflags@'
log_wflags='@log_wflags@'
test_name=INVALID
log_file=BAD.log
trs_file=BAD.trs
extra_opts=
while test $# -gt 0; do
case $1 in
--test-name) test_name=$2; shift;;
--log-file) log_file=$2; shift;;
--trs-file) trs_file=$2; shift;;
# Ignored.
--expect-failure) shift;;
--color-tests) shift;;
--enable-hard-errors) shift;;
# Remembered in the same order they're passed in.
$am_log_wflags|$log_wflags) extra_opts="$extra_opts $1";;
# Explicitly terminate option list.
--) shift; break;;
# Shouldn't happen
*) echo "$0: invalid option/argument: '$1'" >&2; exit 2;;
esac
shift
done
echo "$me" "$test_name" $extra_opts > "$log_file"
: > "$trs_file"
exec "$@"
exit 127
END
sed -e 's|@am_log_wflags@|--am-chk|' \
-e 's|@log_wflags@|--chk|' \
< wrapper.skel > chk-wrapper
sed -e 's|@am_log_wflags@|-am-test|' \
-e 's|@log_wflags@|-test|' \
< wrapper.skel > test-wrapper
sed -e 's|@am_log_wflags@|am|' \
-e 's|@log_wflags@|_|' \
< wrapper.skel > bin/noext-wrapper
# 'test-wrapper' is deliberately not made executable.
chmod a+x chk-wrapper bin/noext-wrapper
# Not needed anymore.
rm -f wrapper.skel
cat > 1.chk << 'END'
#! /bin/sh
exit 0
END
chmod a+x 1.chk
cp 1.chk 2.test
cp 1.chk 3
cp 1.chk 4.c.chk
cp 1.chk 5.suf
cp 1.chk sub/test
$ACLOCAL
$AUTOCONF
$AUTOMAKE
./configure
$MAKE
VERBOSE=yes $MAKE check
ls -l . sub
test ! -r BAD.log
test ! -r BAD.trs
echo 'chk-wrapper 1.chk --am-chk --chk' > 1.exp
echo 'test-wrapper 2.test -am-test -test' > 2.exp
echo 'noext-wrapper 3 am _' > 3.exp
echo 'chk-wrapper 4.c.chk --am-chk --chk' > 4.c.exp
echo 'noext-wrapper 5.suf am _' > 5.suf.exp
echo 'noext-wrapper sub/test am _' > sub/test.exp
st=0
for x in 1 2 3 4.c 5.suf sub/test; do
cat $x.log
diff $x.exp $x.log || st=1
done
Exit $st