From ba5cfa2cc30bce1f3d79d42e5afce402c1dbd478 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Mon, 5 Dec 2016 09:07:38 +0000 Subject: [PATCH] Fix bundle dir for integration-cli test.main was unexpectedly created under docker/integration-cli/bundles/VERSION/test-integration-cli directory. This commit moves test.main to docker/bundles/VERSION/test-integration-cli. Signed-off-by: Akihiro Suda Upstream-commit: 4522f14f8cd0d51ced18c24e0d7929409b82a212 Component: engine --- components/engine/hack/make/.integration-test-helpers | 2 +- components/engine/hack/make/build-integration-test-binary | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/hack/make/.integration-test-helpers b/components/engine/hack/make/.integration-test-helpers index 7b73b2f140..1da4137b9d 100644 --- a/components/engine/hack/make/.integration-test-helpers +++ b/components/engine/hack/make/.integration-test-helpers @@ -20,7 +20,7 @@ bundle_test_integration_cli() { go_test_dir() { dir=$1 precompiled=$2 - testbinary="$DEST/test.main" + testbinary="$ABS_DEST/test.main" testcover=() testcoverprofile=() ( diff --git a/components/engine/hack/make/build-integration-test-binary b/components/engine/hack/make/build-integration-test-binary index 2039be416f..1d9044a944 100644 --- a/components/engine/hack/make/build-integration-test-binary +++ b/components/engine/hack/make/build-integration-test-binary @@ -2,7 +2,7 @@ set -e rm -rf "$DEST" -DEST="$DEST/../test-integration-cli" +DEST="$ABS_DEST/../test-integration-cli" if [ -z $DOCKER_INTEGRATION_TESTS_VERIFIED ]; then source ${MAKEDIR}/.integration-test-helpers