Evolinx/bottle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile.am: fix typo in LOG_DRIVER variable

Browse Source 
Self-executing tests were not being run through the tap log driver.
This caused `make check` to ignore discrepancies between the expected
number of tests and the actual number of tests.

Also, fix some uncommented output from test scripts that could confuse
TAP parsers.

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Andrew Gregory 2013-11-05 08:50:44 -05:00 committed by Allan McRae
parent 0da98ec6ba
commit ea6aeef8ba
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -36,7 +36,7 @@ TEST_EXTENSIONS = .py
AM_TESTS_ENVIRONMENT = \
PMTEST_UTIL_DIR=$(top_builddir)/src/util/; export PMTEST_UTIL_DIR; \
PMTEST_SCRIPTLIB_DIR=$(top_srcdir)/scripts/library/; export PMTEST_SCRIPTLIB_DIR;
TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
$(top_srcdir)/build-aux/tap-driver.sh
PY_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
$(top_srcdir)/build-aux/tap-driver.sh

2
test/scripts/human_to_size_test.sh
View File

@ -10,7 +10,7 @@ if [[ -z $lib || ! -f $lib ]]; then
fi
. "$lib"
if ! type -t human_to_size >/dev/null; then
if ! type -t human_to_size &>/dev/null; then
printf 'Bail out! human_to_size function not found\n'
exit 1
fi

2
test/scripts/parseopts_test.sh
View File

@ -10,7 +10,7 @@ if [[ -z $lib || ! -f $lib ]]; then
fi
. "$lib"
if ! type -t parseopts >/dev/null; then
if ! type -t parseopts &>/dev/null; then
printf 'Bail out! parseopts function not found\n'
exit 1
fi

4
test/util/pacsorttest.sh
View File

@ -25,7 +25,7 @@ total=23
run=0
failure=0
if ! type -p "$bin"; then
if ! type -p "$bin" &>/dev/null; then
echo "Bail out! pacsort binary ($bin) could not be located"
exit 1
fi
@ -47,7 +47,7 @@ runtest() {
fi
}
echo "Running pacsort tests..."
echo "# Running pacsort tests..."
echo "1..$total"

2
test/util/vercmptest.sh
View File

@ -25,7 +25,7 @@ run=0
failure=0
# use first arg as our binary if specified
if ! type -p "$bin"; then
if ! type -p "$bin" &>/dev/null; then
echo "Bail out! vercmp binary ($bin) could not be located"
exit 1
fi