diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2016-12-13 11:27:48 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2016-12-13 11:27:48 +0100 |
| commit | 7569eab0d922ad025e59ee9a67c29411cf35044d (patch) | |
| tree | b0d6a44df794bb733a4c3983377e48dc5e0a6a42 | |
| parent | 4b2907b8073d7aedc084864b91912b649020c0df (diff) | |
fix gccgo testfeature/more-trusty-support
| -rw-r--r-- | spread.yaml | 5 | ||||
| -rw-r--r-- | tests/main/gccgo/task.yaml | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/spread.yaml b/spread.yaml index 5fa10c0ae6..3a4541285e 100644 --- a/spread.yaml +++ b/spread.yaml @@ -4,8 +4,9 @@ environment: GOPATH: /home/gopath REUSE_PROJECT: "$(HOST: echo $REUSE_PROJECT)" PROJECT_PATH: $GOPATH/src/github.com/snapcore/snapd - # /usr/lib/go-1.6/bin for trusty - PATH: /usr/lib/go-1.6/bin:$GOPATH/bin:/snap/bin:$PATH + # /usr/lib/go-1.6/bin for trusty (needs to be last as we use + # a different go in gccgo tests) + PATH: $GOPATH/bin:/snap/bin:$PATH:/usr/lib/go-1.6/bin TESTSLIB: $PROJECT_PATH/tests/lib SNAP_REEXEC: 0 SPREAD_STORE_USER: "$(HOST: echo $SPREAD_STORE_USER)" diff --git a/tests/main/gccgo/task.yaml b/tests/main/gccgo/task.yaml index 31e5d51f67..e0756da9ce 100644 --- a/tests/main/gccgo/task.yaml +++ b/tests/main/gccgo/task.yaml @@ -9,7 +9,7 @@ restore: | apt-get autoremove -y gccgo-6 execute: | echo Ensure we really build with gccgo - go version|grep gccgo + go version|MATCH gccgo echo Build the deb with gccgo and run the tests as part of the build su - -c "cd $GOPATH/src/github.com/snapcore/snapd && dpkg-buildpackage -tc -Zgzip" test |