Hash :
42fb45b7
Author :
Date :
2012-07-26T00:20:03
tests: simplify sourcing of helper shell files
Now that the early $PATH setup in both 'runtest' and AM_TESTS_ENVIRONMENT
allow the '.' built-in to find to-be-sourced shell scripts in the 't/ax/'
directory automatically, we can simplify several usages like:
. "$am_testauxdir"/foo.sh
to just:
. foo.sh
Also, because our test scripts run with the 'errexit' flag active, and
because POSIX mandates that, when the '.' built-in is used,
... if no readable file is found, a non-interactive shell shall abort ...
we can further simplify usages like:
. "$am_testauxdir"/foo.sh || fatal_ "sourcing foo.sh"
once again to to just:
. foo.sh
* ./defs, several tests: Adjusted.
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
#! /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/>.
# TAP support:
# - an exit status != 0 of a test script causes an hard error
# - the '--ignore-exit' option causes the TAP test driver to ignore
# exit statuses of the test scripts.
. ./defs || exit 1
echo TESTS = > Makefile.am
for st in 1 2 77 99; do
unindent > exit${st}.test <<END
#!/bin/sh
echo 1..1
echo ok 1
exit $st
END
echo TESTS += exit${st}.test >> Makefile.am
done
chmod a+x *.test
. tap-setup.sh
$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=8 pass=4 fail=0 xpass=0 xfail=0 skip=0 error=4
grep '^ERROR: exit1\.test - exited with status 1$' stdout
grep '^ERROR: exit2\.test - exited with status 2$' stdout
grep '^ERROR: exit77\.test - exited with status 77$' stdout
grep '^ERROR: exit99\.test - exited with status 99$' stdout
echo TEST_LOG_DRIVER_FLAGS = --ignore-exit >> Makefile
$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=4 pass=4 fail=0 xpass=0 xfail=0 skip=0 error=0
: