From c222c5ac6f906b6766e8c431a873187ccb957ead Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Tue, 16 Jul 2019 20:18:32 +0000 Subject: [PATCH] allow running of single integration test Signed-off-by: Andrew Hsu Signed-off-by: Tibor Vass --- hack/make/.integration-test-helpers | 8 ++++++-- hack/test/e2e-run.sh | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/hack/make/.integration-test-helpers b/hack/make/.integration-test-helpers index d9196b9c49..738e62df32 100644 --- a/hack/make/.integration-test-helpers +++ b/hack/make/.integration-test-helpers @@ -20,8 +20,12 @@ integration_api_dirs=${TEST_INTEGRATION_DIR:-"$( grep -vE '(^./integration($|/internal)|/testdata)')"} run_test_integration() { - [[ "$TESTFLAGS" != *-check.f* ]] && run_test_integration_suites - run_test_integration_legacy_suites + if [[ "$TESTFLAGS" != *-check.f* ]]; then + run_test_integration_suites + fi + if [[ "$TESTFLAGS" != *-test.run* ]]; then + run_test_integration_legacy_suites + fi } run_test_integration_suites() { diff --git a/hack/test/e2e-run.sh b/hack/test/e2e-run.sh index 122d58f8ef..1e12271e85 100755 --- a/hack/test/e2e-run.sh +++ b/hack/test/e2e-run.sh @@ -17,8 +17,12 @@ integration_api_dirs=${TEST_INTEGRATION_DIR:-"$( grep -vE '(^/tests/integration($|/internal)|/testdata)')"} run_test_integration() { - [[ "$TESTFLAGS" != *-check.f* ]] && run_test_integration_suites - run_test_integration_legacy_suites + if [[ "$TESTFLAGS" != *-check.f* ]]; then + run_test_integration_suites + fi + if [[ "$TESTFLAGS" != *-test.run* ]]; then + run_test_integration_legacy_suites + fi } run_test_integration_suites() {