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
#! /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/>.
# Check regression of parallel-tests:
# - 'test-driver' script not correctly distributed when TESTS is
# defined in a subdir Makefile
am_create_testdir=empty
. ./defs || Exit 1
ocwd=`pwd` || fatal_ "getting current working directory"
do_check ()
{
whereopts=$1 auxdir=$2
case $#,$whereopts in
2,ac) ac_opts=parallel-tests am_code= ;;
2,am) am_opts=parallel-tests ac_code= ;;
*) fatal_ "do_check: bad usage";;
esac
mkdir $whereopts
cd $whereopts
mkdir tests
unindent > configure.ac << END
AC_INIT([$me], [1.0])
AC_CONFIG_AUX_DIR([$auxdir])
AM_INIT_AUTOMAKE([$ac_opts])
AC_CONFIG_FILES([Makefile tests/Makefile])
AC_OUTPUT
END
if test $auxdir = .; then
test_driver=test-driver
else
mkdir $auxdir
test_driver=$auxdir/test-driver
fi
# No 'AUTOMAKE_OPTIONS' in here -- purposely.
unindent > Makefile.am << END
SUBDIRS = tests
check-local: test-top
test-top: distdir
ls -l \$(distdir) \$(distdir)/* ;: For debugging.
test -f \$(distdir)/$test_driver
.PHONY: test-top
END
unindent > tests/Makefile.am << END
AUTOMAKE_OPTIONS = $am_opts
check-local: test-sub
test-sub:
echo ' ' \$(DIST_COMMON) ' ' | grep '[ /]$test_driver '
TESTS = foo.test
EXTRA_DIST = \$(TESTS)
END
unindent > tests/foo.test << 'END'
#!/bin/sh
exit 0
END
chmod a+x tests/foo.test
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
./configure
$MAKE test-top
cd tests
$MAKE test-sub
cd ..
$MAKE distcheck
# Try code path without automatic installation of required files.
mv -f Makefile.in Makefile.sav
mv -f tests/Makefile.in tests/Makefile.sav
$AUTOMAKE
diff Makefile.in Makefile.sav
diff tests/Makefile.in tests/Makefile.sav
:
}
do_check ac .
do_check am build-aux
: