From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 23 Jun 2020 14:24:18 +0000 (+0200)
Subject: testing: Skip tests with missing files, don't abort the test run
X-Git-Tag: 5.9.0rc1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2d240954a32174a8a3a3fa454f598b5fb99153f;p=thirdparty%2Fstrongswan.git

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.
---

diff --git a/testing/do-tests b/testing/do-tests
index fad3af8cd5..cc65e6b2ca 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