Check for test interfaces before running system tests

Prevent runall.sh and "make test" from even attempting to run system
tests when "ifconfig.sh up" has not been run beforehand.  This ensures
the user is not flooded with error messages in such a case.
This commit is contained in:
Michał Kępień 2018-01-25 15:26:27 +01:00
parent e1d6c9a663
commit e0221f2d25
2 changed files with 7 additions and 9 deletions

View file

@ -99,6 +99,13 @@ parallel.mk:
# Targets to run the tests.
test: parallel.mk subdirs
@if ! ${PERL} testsock.pl > /dev/null 2>&1; then \
echo "I:NOTE: System tests were skipped because they require that the" ; \
echo "I: IP addresses 10.53.0.1 through 10.53.0.8 be configured" ; \
echo "I: as alias addresses on the loopback interface. Please run" ; \
echo "I: \"bin/tests/system/ifconfig.sh up\" as root to configure them." ; \
exit 1 ; \
fi
@$(MAKE) -f parallel.mk check
@$(SHELL) ./runsequential.sh -r
@$(SHELL) ./testsummary.sh

View file

@ -40,15 +40,6 @@ if [ $keepfile -eq 0 ]; then
rm -f */test.output
fi
$PERL testsock.pl || {
cat <<EOF
I:NOTE: System tests were skipped because they require that the
I: IP addresses 10.53.0.1 through 10.53.0.8 be configured
I: as alias addresses on the loopback interface. Please run
I: "bin/tests/system/ifconfig.sh up" as root to configure them.
EOF
}
status=0
echo "I:System test result summary:"
grep '^R:' systests.output | cut -d':' -f3 | sort | uniq -c | sed -e 's/^/I:/'