summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMax Romanov <max.romanov@nginx.com>2019-12-24 17:59:48 +0300
committerMax Romanov <max.romanov@nginx.com>2019-12-24 17:59:48 +0300
commita427ecd4c547958079cce2dae13060b2d60aa4d4 (patch)
tree0ccb045aa97c64012fb1f5c1ab8b07fdbdcf817d
parent3d712a7078e6cd85dc7f2961628bea46cfea5236 (diff)
downloadunit-a427ecd4c547958079cce2dae13060b2d60aa4d4.tar.gz
unit-a427ecd4c547958079cce2dae13060b2d60aa4d4.tar.bz2
Go: installing go module for tests into build directory.
-rw-r--r--auto/modules/go2
-rw-r--r--test/unit/applications/lang/go.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/auto/modules/go b/auto/modules/go
index 4646684e..fad31036 100644
--- a/auto/modules/go
+++ b/auto/modules/go
@@ -72,7 +72,7 @@ fi
NXT_GO_PATH=${NXT_GO_PATH=`${NXT_GO} env GOPATH`}
-NXT_GO_PATH=${NXT_GO_PATH:-`pwd`/${NXT_GO}}
+NXT_GO_PATH=${NXT_GO_PATH:-${PWD}/${NXT_BUILD_DIR}/${NXT_GO}}
NXT_GO_PKG=nginx/unit
diff --git a/test/unit/applications/lang/go.py b/test/unit/applications/lang/go.py
index b1da8071..7212a95c 100644
--- a/test/unit/applications/lang/go.py
+++ b/test/unit/applications/lang/go.py
@@ -23,7 +23,7 @@ class TestApplicationGo(TestApplicationProto):
os.mkdir(self.testdir + '/go')
env = os.environ.copy()
- env['GOPATH'] = self.pardir + '/go'
+ env['GOPATH'] = self.pardir + '/build/go'
try:
process = Popen(