From 54a5402425edb522b0f646fa83665671ba54523a Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Tue, 24 Apr 2018 12:02:25 +0200 Subject: [PATCH 1/2] Flip sense of conditional-skip of IPsec end-to-end test --- src/apps/ipsec/selftest.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/apps/ipsec/selftest.sh b/src/apps/ipsec/selftest.sh index fc4b8f549e..9ac165bd2d 100755 --- a/src/apps/ipsec/selftest.sh +++ b/src/apps/ipsec/selftest.sh @@ -3,10 +3,7 @@ SKIPPED_CODE=43 -# Temporary disabled test. -exit $SKIPPED_CODE - -if [ "$SNABB_IPSEC_SKIP_E2E_TEST" = yes ]; then +if [ "$SNABB_IPSEC_ENABLE_E2E_TEST" != yes ]; then exit $SKIPPED_CODE fi From f03ba1b9e016f7c147a1102d015d199040cc5e2f Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Tue, 24 Apr 2018 12:08:41 +0200 Subject: [PATCH 2/2] Test on presence of SNABB_IPSEC_ENABLE_E2E_TEST, not value --- src/apps/ipsec/selftest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/ipsec/selftest.sh b/src/apps/ipsec/selftest.sh index 9ac165bd2d..5e6e7228fa 100755 --- a/src/apps/ipsec/selftest.sh +++ b/src/apps/ipsec/selftest.sh @@ -3,7 +3,7 @@ SKIPPED_CODE=43 -if [ "$SNABB_IPSEC_ENABLE_E2E_TEST" != yes ]; then +if [ -n "$SNABB_IPSEC_ENABLE_E2E_TEST" ]; then exit $SKIPPED_CODE fi