Tests: Clean up after "run_all --fast"

This commit is contained in:
Wilhelm Schuermann 2015-05-06 20:56:35 +02:00
parent 0850e26a3e
commit 5fee3ef27c
2 changed files with 25 additions and 13 deletions

3
test/.gitignore vendored
View file

@ -2,6 +2,9 @@
*.pyc *.pyc
*.data *.data
*.log *.log
*.runlog
_run_all_parallel.txt
_run_all_serial.txt
autocomplete.t autocomplete.t
color.t color.t
config.t config.t

View file

@ -3,6 +3,24 @@
# Look for taskd in $PATH instead of task/src/ # Look for taskd in $PATH instead of task/src/
export TASKD_USE_PATH=1 export TASKD_USE_PATH=1
runlog_cleanup() {
if [ -f "_run_all_parallel.txt" ]; then
rm _run_all_parallel.txt
fi
if [ -f "_run_all_serial.txt" ]; then
rm _run_all_serial.txt
fi
for i in *.runlog; do
# Ugly hack. :)
if [ -f "$i" ]; then
rm *.runlog
fi
break
done
}
rc=0 rc=0
if [ x"$1" = x"--verbose" ]; if [ x"$1" = x"--verbose" ];
then then
@ -36,19 +54,8 @@ elif [ "$1" = "--fast" ]; then
# because 'date +%s' isn't supported on Solaris. # because 'date +%s' isn't supported on Solaris.
STARTEPOCH=`perl -e 'print time'` STARTEPOCH=`perl -e 'print time'`
if [ -f "_run_all_parallel.txt" ]; then # Clean up after aborted runs
rm _run_all_parallel.txt runlog_cleanup
fi
if [ -f "_run_all_serial.txt" ]; then
rm _run_all_serial.txt
fi
for i in *.runlog; do
# Ugly hack. :)
if [ -f "$i" ]; then
rm *.runlog
fi
break
done
for i in ${TESTBLOB}; do for i in ${TESTBLOB}; do
if [ -x "$i" ]; then if [ -x "$i" ]; then
@ -86,6 +93,8 @@ elif [ "$1" = "--fast" ]; then
cat *.runlog >> all.log cat *.runlog >> all.log
runlog_cleanup
date >> all.log date >> all.log
ENDEPOCH=`perl -e 'print time'` ENDEPOCH=`perl -e 'print time'`