Hash :
8a5096d1
Author :
Date :
2012-04-06T13:12:25
tests: rename 'tests/' => 't/', '*.test' => '*.sh' When we (soon) convert the Automake testsuite to a non-recursive make setup, we'll have to fix the entries of $(TESTS) to be prepended with the subdirectory they are in; this will increase the length of $(TESTS), and thus increase the possibility of exceeding the command-line length limits on some systems (most notably, MinGW/MSYS). See automake bug#7868 for more information. Thus we rename the 'tests/' subdirectory to 't/', and each 'x.test' script in there to 'x.sh'; this way, the $(TESTS) entry 'foo.test' will become 't/foo.sh', which have the same number of characters. * tests/: Rename ... * t/: ... to this. * t/*.test: Rename ... * t/*.sh: ... to this. * t/.gitignore: Removed as obsolete. * t/defs: Adjust. * t/gen-testsuite-part: Likewise. * t/list-of-tests.mk: Likewise. * t/ccnoco.sh: Likewise. * t/ccnoco3.sh: Likewise. * t/self-check-cleanup.tap: Likewise. * t/self-check-dir.tap: Likewise. * t/self-check-me.tap: Likewise. * t/self-check-reexec.tap: Likewise. * README: Likewise. * bootstrap: Likewise * configure.ac: Likewise. * Makefile.am: Likewise. * .gitignore: Likewise. * syntax-check.mk: Likewise. 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
#! /bin/sh
# Copyright (C) 2009-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 parallel-tests features:
# - concurrent parallel execution
am_parallel_tests=yes
. ./defs || Exit 1
case $MAKE in
*\ -j*) skip_ "\$MAKE contains '-j'";;
esac
if using_gmake; then
j=-j
else
unindent > Makefile <<END
all: one two
one:
$sleep && test -f two
two:
echo ok > \$@
END
for j in "-j" "-j " NONE; do
if test x"$j" = xNONE; then
skip_ "can't run make in parallel mode"
fi
$MAKE ${j}2 all >output 2>&1 || continue
$EGREP -i "(warning|error):|-j[\"\'\` ]" output && continue
break
done
rm -f one output Makefile
fi
cat >> configure.ac << 'END'
AC_OUTPUT
END
cat > Makefile.am << 'END'
TESTS =
END
cat > x <<'END'
#! /bin/sh
echo "this is $0"
# Creative quoting below to please maintainer-check.
sleep '1'
exit 0
END
chmod a+x ./x
mkdir sub
for i in 1 2 3; do
echo "TESTS += foo$i.test" >> Makefile.am
cp x foo$i.test
echo "TESTS += zap$i" >> Makefile.am
cp x zap$i
echo "TESTS += sub/bar$i.test" >> Makefile.am
cp x sub/bar$i.test
echo "TESTS += sub/mu$i" >> Makefile.am
cp x sub/mu$i
done
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
for build in serial parallel; do
mkdir $build
cd $build
../configure
$MAKE
cd ..
done
cd serial
$MAKE ${j}1 check &
cd ../parallel
$sleep
# Use append mode here to avoid dropping output.
# Yes, this actually happens.
: >stdout
$MAKE ${j}4 check >> stdout
cd ..
# Ensure the tests are really being run in parallel mode: if this is
# the case, the serial run of the dummy testsuite started above should
# still be ongoing when the parallel one has terminated.
kill -0 $!
cat parallel/stdout
test `grep -c '^PASS:' parallel/stdout` -eq 12
# Wait long enough so that there are no open files any more when the
# post-test cleanup runs. But exit after we've waited for two minutes
# or more, to avoid testsuite hangs in unusual situations (this has
# already happened).
i=1
while test ! -f serial/test-suite.log && test $i -le 120; do
i=`expr $i + 1`
sleep '1' # Extra quoting to please maintainer-check.
done
$sleep
: