And similarly, "am_using_tap=no" -> "am_test_protocol=none".
The new '$am_test_protocol' name is clearer, and will allow the easy
addition of further test protocols in the future. This is not truly
relevant for automake, but we are trying to make some parts of our
testsuite framework as general as possible, in view of a future move
to a more generic project like Gnulib.
* Makefile.am, t/ax/am-test-lib.sh, t/ax/test-defs.in, t/ax/test-lib.sh,
t/self-check-env-sanitize.tap, t/self-check-tap.sh: Adjust.
* syntax-checks.mk (sc_tests_obsolete_variables): Add 'am_using_tap' to
the list of obsolete variables to check against.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
AM_TESTS_ENVIRONMENT = \
for v in \
required \
- am_using_tap \
+ am_test_protocol \
am_serial_tests \
am_test_prefer_config_shell \
am_original_AUTOMAKE \
sc_tests_obsolete_variables:
@vars=" \
using_tap \
+ am_using_tap \
test_prefer_config_shell \
original_AUTOMAKE \
original_ACLOCAL \
$AUTOMAKE ${1+"$@"} >stdout 2>stderr || am__got_rc=$?
cat stderr >&2
cat stdout
- if test $am_using_tap != yes; then
+ if test $am_test_protocol = none; then
test $am__got_rc -eq $am__exp_rc || exit 1
return
fi
am_extra_info ()
{
echo "Running from installcheck: $am_running_installcheck"
- echo "Using TAP: $am_using_tap"
+ echo "Test Protocol: $am_test_protocol"
echo "PATH = $PATH"
}
# treats such variables as if they were unset.
for var in \
required \
- am_using_tap \
+ am_test_protocol \
am_serial_tests \
am_create_testdir \
am_tap_implementation \
# See whether the current test script is expected to use TAP or not.
# Use a sensible default, while allowing the scripts to override this
# check.
-if test -z "$am_using_tap"; then
- case $argv0 in *.tap) am_using_tap=yes;; *) am_using_tap=no;; esac
+if test -z "$am_test_protocol"; then
+ case $argv0 in
+ *.tap) am_test_protocol=tap;;
+ *) am_test_protocol=none;;
+ esac
fi
am_rel_srcdir='@srcdir@'
# For compatibility with TAP functions.
skip_all_ () { skip_ "$@"; }
-if test $am_using_tap = yes; then
+if test $am_test_protocol = tap; then
. tap-functions.sh
fi
exit_status=$1
set +e
cd "$am_top_builddir"
- if test $am_using_tap = yes; then
+ if test $am_test_protocol = tap; then
if test "$planned_" = later && test $exit_status -eq 0; then
plan_ "now"
fi
vars='
required
am_serial_tests
- am_using_tap
+ am_test_protocol
am_create_testdir
am_tap_implementation
am_test_prefer_config_shell
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Sanity check for the automake testsuite.
-# Make sure that '$am_using_tap' gets automatically defined by
+# Make sure that '$am_test_protocol' gets automatically defined by
# 'test-defs.sh', but can be overridden by the individual tests.
. test-defs.sh
set -ex
$AM_TEST_RUNNER_SHELL -c \
- ". test-defs.sh && test \$am_using_tap = yes" foo.tap
+ ". test-defs.sh && test \$am_test_protocol = tap" foo.tap
for name in foo.test tap tap.test foo-tap; do
$AM_TEST_RUNNER_SHELL -c \
- ". test-defs.sh && test \$am_using_tap = no" $name
+ ". test-defs.sh && test \$am_test_protocol = none" $name
done
$AM_TEST_RUNNER_SHELL -c "
- am_using_tap=no
+ am_test_protocol=none
. test-defs.sh
- test \$am_using_tap = no
+ test \$am_test_protocol = none
" foo.tap
$AM_TEST_RUNNER_SHELL -c "
- am_using_tap=yes
+ am_test_protocol=tap
. test-defs.sh
- test \$am_using_tap = yes
+ test \$am_test_protocol = tap
" foo.test
: