Hash :
db973eaa
Author :
Date :
2012-02-21T19:47:36
tests: prefer 'configure.ac' over 'configure.in' With this change, our testsuite now uses 'configure.ac' as the name for the typical autoconf input, instead of the obsolescent 'configure.in' (which has been deprecated for several years, at least since autoconf 2.50). Most of the test cases changed by this commit have been automatically modified with this sed command (using GNU sed): sed -i 's/\<configure\(\\\?\)\.in\>/configure\1.ac/g' * syntax-checks.mk (sc_tests_no_configure_in): New syntax check. (syntax_check_rules): Add it. * tests/defs: Create stub for autoconf input in 'configure.ac', not in 'configure.in'. Adjust comments. ($AUTOCONF, $AUTOHEADER, $AUTORECONF): Remove workaround for the infamous debian autoconf wrapper: we don't need such workaround anymore now that we name our autoconf input as 'configure.ac'. For more information, see commit v1.11-564-g63da492 "test defs: hack to support autoconf-wrapper programs" of 16-12-2011. * tests/README: Use 'configure.ac', not 'configure.in'. * Many many tests: Likewise. * tests/backcompat3.test: Adjust to avoid spurious failures. * tests/backcompat5.test: Likewise. * tests/missing6.test: Likewise. * tests/backcompat6.test: Likewise, and extend a bit since we are at it.
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
#! /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/>.
# parallel-tests:
# - Automake can correctly handle conditionals contents for the
# LOG_DRIVER variables.
am_parallel_tests=yes
. ./defs || Exit 1
cp "$testsrcdir"/trivial-test-driver . \
|| fatal_ "failed to fetch auxiliary script trivial-test-driver"
cp "$am_scriptdir"/tap-driver.pl . \
|| fatal_ "failed to fetch auxiliary script tap-driver.pl"
cat >> configure.ac << END
AM_CONDITIONAL([COND1], [:])
AM_CONDITIONAL([COND2], [false])
AM_CONDITIONAL([COND3], [false])
AC_SUBST([PERL], ['$PERL'])
AC_SUBST([my_LOG_DRIVER], ['\${SHELL} \${top_srcdir}/trivial-test-driver'])
AM_SUBST_NOTMAKE([my_LOG_DRIVER])
AC_OUTPUT
END
$ACLOCAL
$AUTOCONF
cat > Makefile.am << 'END'
TESTS = foo bar.test baz.sh
EXTRA_DIST = $(TESTS) tap-driver.pl trivial-test-driver
TEST_EXTENSIONS = .test .sh
LOG_DRIVER =
SH_LOG_DRIVER = $(tap_rulez)
if COND1
LOG_DRIVER += @my_LOG_DRIVER@
if COND2
tap_rulez = false
else !COND2
tap_rulez = $(PERL) $(srcdir)/tap-driver.pl
endif !COND2
endif COND1
END
cat > foo <<'END'
#!/bin/sh
echo "PASS: from $0"
echo "SKIP: from $0"
exit 1 # Exit status should be ignored by the trivial-test-driver.
END
cat > bar.test <<'END'
#!/bin/sh
exit 0
END
cat > baz.sh <<'END'
#!/bin/sh
echo 1..3
echo 'ok 1'
echo 'not ok 2 # TODO'
echo 'not ok 3 # TODO'
END
chmod a+x foo bar.test baz.sh
$AUTOMAKE -a
test -f test-driver
grep DRIVER Makefile.in || Exit 99 # For debugging.
grep '^my_LOG_DRIVER *=' Makefile.in \
&& fatal_ 'unexpected $(my_LOG_DRIVER) in Makefile.in'
grep '^TEST_LOG_DRIVER =.*\$(SHELL).*/test-driver' Makefile.in
$PERL -MTAP::Parser -e 1 \
|| skip_ "cannot import TAP::Parser perl module"
./configure
do_count ()
{
count_test_results total=6 pass=3 fail=0 skip=1 xfail=2 xpass=0 error=0
grep '^PASS: foo, testcase 1 *$' stdout
grep '^SKIP: foo, testcase 2 *$' stdout
grep '^PASS: bar\.test *$' stdout
$EGREP 'PASS: baz\.sh 1( |$)' stdout
$EGREP 'XFAIL: baz\.sh 2( |$)' stdout
$EGREP 'XFAIL: baz\.sh 3( |$)' stdout
}
st=0; $MAKE check >stdout || st=$?
cat stdout
cat test-suite.log
cat foo.log
cat bar.log
cat baz.log
test $st -eq 0 || Exit 1
do_count
$MAKE distcheck >stdout || { cat stdout; Exit 1; }
cat stdout
do_count
: