From f2d240954a32174a8a3a3fa454f598b5fb99153f Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 23 Jun 2020 16:24:18 +0200 Subject: [PATCH] testing: Skip tests with missing files, don't abort the test run This allows simple test configs in testing/tests/local that are no actual test cases. --- testing/do-tests | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testing/do-tests b/testing/do-tests index fad3af8cd..cc65e6b2c 100755 --- a/testing/do-tests +++ b/testing/do-tests @@ -313,11 +313,11 @@ do continue fi - [ -f $DEFAULTTESTSDIR/${testname}/description.txt ] || die "!! File 'description.txt' is missing" - [ -f $DEFAULTTESTSDIR/${testname}/test.conf ] || die "!! File 'test.conf' is missing" - [ -f $DEFAULTTESTSDIR/${testname}/pretest.dat ] || die "!! File 'pretest.dat' is missing" - [ -f $DEFAULTTESTSDIR/${testname}/posttest.dat ] || die "!! File 'posttest.dat' is missing" - [ -f $DEFAULTTESTSDIR/${testname}/evaltest.dat ] || die "!! File 'evaltest.dat' is missing" + [ ! -f $DEFAULTTESTSDIR/${testname}/description.txt ] && echo "!! File 'description.txt' is missing" && continue + [ ! -f $DEFAULTTESTSDIR/${testname}/test.conf ] && echo "!! File 'test.conf' is missing" && continue + [ ! -f $DEFAULTTESTSDIR/${testname}/pretest.dat ] && echo "!! File 'pretest.dat' is missing" && continue + [ ! -f $DEFAULTTESTSDIR/${testname}/posttest.dat ] && echo "!! File 'posttest.dat' is missing" && continue + [ ! -f $DEFAULTTESTSDIR/${testname}/evaltest.dat ] && echo "!! File 'evaltest.dat' is missing" && continue TESTRESULTDIR=$TODAYDIR/$testname mkdir -p $TESTRESULTDIR