Browse code

allow running of single integration test

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit c222c5ac6f906b6766e8c431a873187ccb957ead)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Andrew Hsu authored on 2019/07/17 05:18:32
Showing 2 changed files
... ...
@@ -20,8 +20,12 @@ integration_api_dirs=${TEST_INTEGRATION_DIR:-"$(
20 20
 	grep -vE '(^./integration($|/internal)|/testdata)')"}
21 21
 
22 22
 run_test_integration() {
23
-	[[ "$TESTFLAGS" != *-check.f* ]] && run_test_integration_suites
24
-	run_test_integration_legacy_suites
23
+	if [[ "$TESTFLAGS" != *-check.f* ]]; then
24
+		run_test_integration_suites
25
+	fi
26
+	if [[ "$TESTFLAGS" != *-test.run* ]]; then
27
+		run_test_integration_legacy_suites
28
+	fi
25 29
 }
26 30
 
27 31
 run_test_integration_suites() {
... ...
@@ -17,8 +17,12 @@ integration_api_dirs=${TEST_INTEGRATION_DIR:-"$(
17 17
 	grep -vE '(^/tests/integration($|/internal)|/testdata)')"}
18 18
 
19 19
 run_test_integration() {
20
-	[[ "$TESTFLAGS" != *-check.f* ]] && run_test_integration_suites
21
-	run_test_integration_legacy_suites
20
+	if [[ "$TESTFLAGS" != *-check.f* ]]; then
21
+		run_test_integration_suites
22
+	fi
23
+	if [[ "$TESTFLAGS" != *-test.run* ]]; then
24
+		run_test_integration_legacy_suites
25
+	fi
22 26
 }
23 27
 
24 28
 run_test_integration_suites() {