Browse Source

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 <suda.akihiro@lab.ntt.co.jp>
Akihiro Suda 8 years ago
parent
commit
4522f14f8c
2 changed files with 2 additions and 2 deletions
  1. 1 1
      hack/make/.integration-test-helpers
  2. 1 1
      hack/make/build-integration-test-binary

+ 1 - 1
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=()
 	(

+ 1 - 1
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