Browse Source

build,test: set up GOPATH in build script

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
Gyuho Lee 7 years ago
parent
commit
18f8b1b1e1
2 changed files with 4 additions and 4 deletions
  1. 4 0
      build
  2. 0 4
      test

+ 4 - 0
build

@@ -84,6 +84,10 @@ tools_build() {
 
 
 toggle_failpoints_default
 toggle_failpoints_default
 
 
+if [[ "${ETCD_SETUP_GOPATH}" == "1" ]]; then
+	etcd_setup_gopath
+fi
+
 # only build when called directly, not sourced
 # only build when called directly, not sourced
 if echo "$0" | grep "build$" >/dev/null; then
 if echo "$0" | grep "build$" >/dev/null; then
 	etcd_build
 	etcd_build

+ 0 - 4
test

@@ -16,10 +16,6 @@ set -e
 
 
 source ./build
 source ./build
 
 
-if [[ "${ETCD_SETUP_GOPATH}" == "1" ]]; then
-	etcd_setup_gopath
-fi
-
 # build before setting up test GOPATH
 # build before setting up test GOPATH
 if [[ "${PASSES}" == *"functional"* ]]; then
 if [[ "${PASSES}" == *"functional"* ]]; then
 	./tools/functional-tester/build
 	./tools/functional-tester/build