Hash :
5e771b27
Author :
Date :
2012-05-18T18:00:51
check: the parallel-tests driver is now the default
The old serial testsuite driver is still supported, and can be activated
by the 'serial-tests' option (introduced by commit 'v1.11-1989-gdeb7773'
of 2012-02-20, "automake: new option 'serial-tests'").
* lib/Automake/Options.pm: Now, the 'parallel-tests' option is a no-op
(but still explicitly recognized, for backward compatibility), while the
'serial-tests' option is recognized and registered.
* automake.in: Adjust to ensure that the parallel test harness is used by
default; mostly, this amounts at using "! option('serial-tests')" where
"option('parallel-tests')" was used before.
* NEWS, doc/automake.texi: Update.
* configure.ac (AM_INIT_AUTOMAKE): Drop 'parallel-tests' option, is
redundant now.
* defs: In the generated AM_INIT_AUTOMAKE call, use the 'serial-tests'
when the serial testsuite harness is to be used, and no option otherwise.
* lib/am/check.am: Use (static) conditional '%SERIAL_TESTS%' instead of
conditional '%PARALLEL_TESTS%'.
* lib/test-driver: Adjust heading comments.
* t/ax/extract-testsuite-summary.pl: Likewise.
* t/check-exported-srcdir.sh: Likewise.
* t/check-subst.sh: Likewise.
* t/java-compile-run-nested.sh: Likewise.
* t/parallel-tests-dry-run-1.sh: Likewise.
* t/parallel-tests-dry-run-2.sh: Likewise.
* t/parallel-tests-interrupt.sh: Likewise.
* t/parallel-tests-many.sh: Likewise.
* t/test-metadata-global-log.sh: Likewise.
* t/tests-environment-backcompat.sh: Likewise.
* m4/init.m4 (AM_INIT_AUTOMAKE): Adjust a comment.
* t/check8.sh: Likewise.
* t/check-tests-in-builddir.sh: Likewise.
* t/java-compile-run-flat.sh: Adjust a botched comment.
* t/ax/tap-summary-aux.sh: Remove explicit use of the 'parallel-tests'
option.
* t/ax/testsuite-summary-checks.sh: Likewise.
* t/aclocal-path-precedence.sh: Likewise.
* t/dist-aux-many-subdirs.sh: Likewise.
* t/parallel-tests-no-color-in-log.sh: Likewise.
* t/parallel-tests-reset-term.sh: Likewise.
* t/parallel-tests-subdir.sh: Likewise.
* t/check-no-test-driver.sh: Fix setup to adjust to the changed
semantics. Update heading comments.
* t/parallel-tests-driver-install.sh: Adjust to the new semantic.
* t/test-driver-is-distributed.sh: Simplified according to the
new semantics.
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
#! /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/>.
# It should be legitimate for many subdir Makefiles to require the
# same config-aux files.
am_create_testdir=empty
required=cc
. ./defs || Exit 1
count=0
ocwd=`pwd` || fatal_ "cannot get current working directory"
# Usage: do_check [--add-missing] [CONFIG-AUXDIR-PATH=.]
do_check ()
{
case $1 in
-a|--add-missing) add_missing=yes; shift;;
*) add_missing=no;;
esac
auxdir=${1-.}
count=`expr $count + 1`
mkdir T$count.d
cd T$count.d
distdir=$me-$count
unindent > configure.ac << END
AC_INIT([$me], [$count])
AC_CONFIG_AUX_DIR([$auxdir])
AM_INIT_AUTOMAKE
AC_PROG_CC
# We don't want to require python or emcas in this test, so
# the tricks below.
AM_PATH_PYTHON([2.2], [], [:])
EMACS=no; AM_PATH_LISPDIR
AC_CONFIG_FILES([Makefile])
END
unindent > Makefile.stub <<'END'
## For depcomp.
bin_PROGRAMS = foo
foo_SOURCES = foo.c
## For py-compile.
python_PYTHON = bar.py
## For elisp-comp.
lisp_LISP = baz.el
## For test-driver.
TESTS =
END
required_files='
install-sh
missing
depcomp
py-compile
elisp-comp
test-driver
'
echo "SUBDIRS =" > Makefile.am
suffixes='0 1 2 3 4 5 6 7 8 9'
for x in $suffixes; do
mkdir sub$x
echo "SUBDIRS += sub$x" >> Makefile.am
echo "AC_CONFIG_FILES([sub$x/Makefile])" >> configure.ac
cp Makefile.stub sub$x/Makefile.am
echo 'int main (void) { return 0; }' > sub$x/foo.c
touch sub$x/bar.py sub$x/baz.el
done
echo AC_OUTPUT >> configure.ac
$ACLOCAL
$AUTOCONF
"$am_scriptdir"/install-sh -d $auxdir \
|| fatal_ "creating directory '$auxdir' with install-sh"
if test $add_missing = yes; then
$AUTOMAKE -a --copy
for f in $required_files; do
test -f $auxdir/$f
# To ensure that if a auxiliary file is required and distributed
# by many Makefiles, the "dist" rule won't try to copy it multiple
# times in $(distdir).
chmod a-w $auxdir/$f
done
else
for f in $required_files; do
cp "$am_scriptdir"/$f $auxdir/$f \
|| fatal_ "faild to fetch auxiliary script '$f'"
# See comments above.
chmod a-w $auxdir/$f
done
$AUTOMAKE
fi
for vpath in : false; do
if $vpath; then
mkdir build
cd build
srcdir=..
else
srcdir=.
fi
$srcdir/configure
$MAKE distdir
find $distdir # For debugging.
for f in $required_files; do
test -f $distdir/$auxdir/$f
done
cd $srcdir
done
cd "$ocwd" || fatal_ "cannot chdir back to '$ocwd'"
}
do_check .
do_check --add-missing .
do_check build-aux
do_check --add-missing build-aux
do_check a/b/c
do_check --add-missing a/b/c
: