Hash :
d3844bbf
Author :
Date :
2013-02-14T12:32:27
tests on TAP: don't run the driver with perl unconditionally * t/ax/tap-setup.sh: When a 'Makefile.am' was pre-existent in the test directory at the moment the client test script sourced this file, said 'Makefile.am' was tweaked to provide it with a proper definition of TEST_LOG_DRIVER. However, there was an error in this automatic definition, since it caused the TAP test driver to be unconditionally invoked with perl. This wasn't an issue in most situations, since perl is smart enough to re-execute a given script with the proper interpreter if it sees a she-bang line that doesn't seem to point to perl itself. Still, there is no reason to do something blatantly wrong even if our tools correct the dumb mistake for us. So fix the TEST_LOG_DRIVER definition. 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
#! /bin/sh
# Copyright (C) 2011-2013 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/>.
# Auxiliary shell script that copies the common data and files used by
# many tests on TAP support into the current directory. It should be
# sourced by client test scripts, and assumes the auxiliary test
# 'tap-common-setup.test' has been run beforehand (it will error out
# if this is not the case).
# Check that we are running from a proper directory: last thing we want
# is to overwrite some random user files.
test -f ../../automake && test -f ../../runtest && test -d ../../t \
|| fatal_ "running from a wrong directory"
test ! -f Makefile.am || mv Makefile.am Makefile.am~ \
|| fatal_ "failed to save Makefile.am"
test -d ../tap-common-setup.dir && cp -fpR ../tap-common-setup.dir/* . \
|| fatal_ "couldn't get precomputed data files"
fetch_tap_driver
if test -f Makefile.am~; then
mv -f Makefile.am~ Makefile.am \
|| fatal_ "failed to restore Makefile.am"
echo 'TEST_LOG_DRIVER = $(srcdir)/tap-driver' >> Makefile.am \
|| fatal_ "failed to update Makefile.am"
$AUTOMAKE Makefile \
|| fatal_ "failed to remake Makefile.in"
./config.status Makefile \
|| fatal_ "failed to remake Makefile"
fi
: