build,test: set up GOPATH in build script

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
2018-02-27 10:23:14 -08:00 · 2018-02-27 10:23:14 -08:00 · 18f8b1b1e1
parent 32c46954ee
commit 18f8b1b1e1
2 changed files with 4 additions and 4 deletions
--- a/4
+++ b/4
@ -84,6 +84,10 @@ tools_build() {

 toggle_failpoints_default

+if [[ "${ETCD_SETUP_GOPATH}" == "1" ]]; then
+	etcd_setup_gopath
+fi
+
 # only build when called directly, not sourced
 if echo "$0" | grep "build$" >/dev/null; then
 	etcd_build
--- a/4
+++ b/4
@ -16,10 +16,6 @@ set -e

 source ./build

-if [[ "${ETCD_SETUP_GOPATH}" == "1" ]]; then
-	etcd_setup_gopath
-fi
-
 # build before setting up test GOPATH
 if [[ "${PASSES}" == *"functional"* ]]; then
 	./tools/functional-tester/build