From bb626a427ec366a34b9bf2cb9ecf749ca1600c58 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sat, 12 Aug 2017 06:19:12 +0000 Subject: [PATCH] Fix `make build-integration-cli-on-swarm` Signed-off-by: Akihiro Suda Upstream-commit: 2fddf9f6efc155c880dfa689bd7df3a5a31ba459 Component: engine --- components/engine/hack/make/.integration-test-helpers | 4 ++++ components/engine/hack/make/build-integration-test-binary | 8 ++++++++ 2 files changed, 12 insertions(+) create mode 100755 components/engine/hack/make/build-integration-test-binary diff --git a/components/engine/hack/make/.integration-test-helpers b/components/engine/hack/make/.integration-test-helpers index 288be863ce..aaeec8706c 100644 --- a/components/engine/hack/make/.integration-test-helpers +++ b/components/engine/hack/make/.integration-test-helpers @@ -33,6 +33,10 @@ run_test_integration() { } build_test_suite_binaries() { + if [ $DOCKER_INTEGRATION_TESTS_VERIFIED ]; then + echo "Skipping building test binaries; as DOCKER_INTEGRATION_TESTS_VERIFIED is set" + return + fi build_test_suite_binary ./integration-cli "test.main" for dir in $integration_api_dirs; do build_test_suite_binary "$dir" "test.main" diff --git a/components/engine/hack/make/build-integration-test-binary b/components/engine/hack/make/build-integration-test-binary new file mode 100755 index 0000000000..ad3e8c2123 --- /dev/null +++ b/components/engine/hack/make/build-integration-test-binary @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +# required by `make build-integration-cli-on-swarm` +set -e + +source "${MAKEDIR}/.go-autogen" +source hack/make/.integration-test-helpers + +build_test_suite_binaries