diff options
author | Jakob Borg <jakob@nym.se> | 2014-12-17 12:31:03 +0100 |
---|---|---|
committer | Jakob Borg <jakob@nym.se> | 2014-12-19 12:43:48 +0100 |
commit | 2090530bbb77df76ec260e01368c6674f4222b16 (patch) | |
tree | 1b429ead7ce8eef3853e87bd822b0b1519b7d8ee /build.sh | |
parent | b6cb7ddbaf9b52e8df06da4c9765e2519b511918 (diff) | |
download | syncthing-2090530bbb77df76ec260e01368c6674f4222b16.tar.gz syncthing-2090530bbb77df76ec260e01368c6674f4222b16.zip |
Improve and clean up integration tests, benchmark.
Diffstat (limited to 'build.sh')
-rwxr-xr-x | build.sh | 14 |
1 files changed, 6 insertions, 8 deletions
@@ -105,7 +105,7 @@ case "${1:-default}" in ;; docker-init) - docker build -q -t syncthing/build:$DOCKERIMGV docker >/dev/null + docker build -q -t syncthing/build:$DOCKERIMGV docker ;; docker-all) @@ -122,17 +122,15 @@ case "${1:-default}" in docker-test) docker run --rm -h syncthing-builder -u $(id -u) -t \ - -v $(pwd):/tmp/syncthing \ + -v $(pwd):/go/src/github.com/syncthing/syncthing \ + -w /go/src/github.com/syncthing/syncthing \ syncthing/build:$DOCKERIMGV \ - sh -euxc 'mkdir -p /go/src/github.com/syncthing \ - && cd /go/src/github.com/syncthing \ - && cp -r /tmp/syncthing syncthing \ - && cd syncthing \ - && ./build.sh clean \ + sh -euxc './build.sh clean \ && go run build.go -race \ && export GOPATH=$(pwd)/Godeps/_workspace:$GOPATH \ && cd test \ - && go test -tags integration -v -timeout 60m -short' + && go test -tags integration -v -timeout 60m -short \ + && git clean -fxd .' ;; *) |