upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-29 09:40:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[rt46602] Add ability to prevent deletion of output files when running all tests

Browse source 
Some tests may need to examine all output files from all system tests.
Allow the deletion of these files to be inhibited if required.

(cherry picked from commit 00bc29640b)
This commit is contained in:
Stephen Morris 2017-12-20 19:05:59 +00:00
parent d150fe27ed
commit ec063cdc99
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/tests/system/Makefile.in
View file

@ -60,7 +60,7 @@ parallel.mk:
for directory in $(PARALLEL) ; do \
echo "" >> $@ ; \
echo "$$directory:" >> $@ ; \
echo " @$(SHELL) ./run.sh -r -p $$port $$directory 2>&1 | tee $$directory/test.output" >> $@ ; \
echo " @$(SHELL) ./run.sh $$NOCLEAN -r -p $$port $$directory 2>&1 | tee $$directory/test.output" >> $@ ; \
port=`expr $$port + 100` ; \
done
@ -68,7 +68,7 @@ parallel.mk:
test: parallel.mk subdirs
@$(MAKE) -f parallel.mk check
@$(SHELL) ./runsequential.sh -r
@$(SHELL) ./runsequential.sh $$NOCLEAN -r
@$(SHELL) ./testsummary.sh
check: test

14
bin/tests/system/runall.sh
View file

@ -17,7 +17,15 @@
SYSTEMTESTTOP=.
. $SYSTEMTESTTOP/conf.sh
usage="Usage: ./runall.sh [numprocesses]"
usage="Usage: ./runall.sh [-n] [numprocesses]"
while getopts "n" flag; do
case "$flag" in
n) CLEANFLAG="NOCLEAN=-n" ;;
*) echo "$usage" >&2 ; exit 1 ;;
esac
done
shift `expr $OPTIND - 1`
if [ $# -eq 0 ]; then
numproc=1
@ -25,7 +33,7 @@ elif [ $# -eq 1 ]; then
test "$1" -eq "$1" > /dev/null 2>& 1
if [ $? -ne 0 ]; then
# Value passed is not numeric
echo "$usage"
echo "$usage" >&2
exit 1
fi
numproc=$1
@ -34,6 +42,6 @@ else
exit 1
fi
make -j $numproc check
$CLEANFLAG make -j $numproc check
exit $?