From 7fb8f066f29df97fccdfa6f262c98d380d2e2f8c Mon Sep 17 00:00:00 2001 From: Ryuma Yoshida Date: Thu, 10 Dec 2020 11:30:48 +0900 Subject: [PATCH 1/3] Update Makefile to accept arguments in the integration target Signed-off-by: Ryuma Yoshida --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9f43cb5906..e125322ff9 100644 --- a/Makefile +++ b/Makefile @@ -319,7 +319,7 @@ else endif integration: - $(E)./test/integration/test.sh + $(E)./test/integration/test.sh $(SUITES) ############################################################################# # Build Artifact From b77323106861f669a2f630dc0fda0720c087735a Mon Sep 17 00:00:00 2001 From: Ryuma Yoshida Date: Fri, 11 Dec 2020 13:50:03 +0900 Subject: [PATCH 2/3] Update help message of the integration target Signed-off-by: Ryuma Yoshida --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index e125322ff9..65cbae3c4f 100644 --- a/Makefile +++ b/Makefile @@ -32,6 +32,8 @@ help: @echo " $(cyan)test$(reset) - run unit tests" @echo " $(cyan)race-test$(reset) - run unit tests with race detection" @echo " $(cyan)integration$(reset) - run integration tests (requires Docker images)" + @echo " support 'SUITES' variable for executing specific tests" + @echo " e.g. SUITES='suites/join-token suites/k8s' make integration" @echo @echo "$(bold)Build and test:$(reset)" @echo " $(cyan)all$(reset) - build all SPIRE binaries, lint the code, and run unit tests" From b94a262a84d37d1bb0e43d1742a57d11d0e63c4e Mon Sep 17 00:00:00 2001 From: Ryuma Yoshida Date: Wed, 16 Dec 2020 10:25:21 +0900 Subject: [PATCH 3/3] Fix the conflict Signed-off-by: Ryuma Yoshida --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0a6d700ae3..da8aca1c92 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ help: @echo " $(cyan)test$(reset) - run unit tests" @echo " $(cyan)race-test$(reset) - run unit tests with race detection" @echo " $(cyan)integration$(reset) - run integration tests (requires Docker images)" - @echo " support 'SUITES' variable for executing specific tests" + @echo " support 'SUITES' variable for executing specific tests" @echo " e.g. SUITES='suites/join-token suites/k8s' make integration" @echo @echo "$(bold)Build and test:$(reset)"