From: Tobias Brunner Date: Tue, 22 Sep 2020 15:31:45 +0000 (+0200) Subject: testing: Build certificates when make-testing is called X-Git-Tag: 5.9.1dr1~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=428c0b293d57faf9cb5173965bfccc5e3d4e8394;p=thirdparty%2Fstrongswan.git testing: Build certificates when make-testing is called --- diff --git a/testing/make-testing b/testing/make-testing index 84ac20bf2f..f110f46a65 100755 --- a/testing/make-testing +++ b/testing/make-testing @@ -21,7 +21,12 @@ then $DIR/scripts/build-guestkernel || exit 1 fi -if [ $ENABLE_BUILD_GUESTIMAGES = "yes" ] +if [ $ENABLE_BUILD_CERTIFICATES = "yes" ] then - $DIR/scripts/build-guestimages $HOSTS || exit 1 + # this always builds the guest images too + $DIR/scripts/build-certs || exit 1 + +elif [ $ENABLE_BUILD_GUESTIMAGES = "yes" ] +then + $DIR/scripts/build-guestimages || exit 1 fi diff --git a/testing/testing.conf b/testing/testing.conf index 195d878fd3..1369c930f6 100644 --- a/testing/testing.conf +++ b/testing/testing.conf @@ -76,11 +76,12 @@ fi : ${TESTRESULTSDIR=$TESTDIR/testresults} ############################################################## -# Enable particular steps in the make-testing +# Enable particular steps in the make-testing script # : ${ENABLE_BUILD_BASEIMAGE=yes} : ${ENABLE_BUILD_ROOTIMAGE=yes} : ${ENABLE_BUILD_GUESTKERNEL=yes} +: ${ENABLE_BUILD_CERTIFICATES=yes} : ${ENABLE_BUILD_GUESTIMAGES=yes} ##############################################################