From 3f3f038b73e5a92986cbc582b75a56a7d1477181 Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Sun, 8 Sep 2019 11:35:36 +0100 Subject: [PATCH] build: make sure we add version info to test_all build --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 545b9d52e..b33d3e467 100644 --- a/Makefile +++ b/Makefile @@ -30,13 +30,15 @@ BUILDTAGS=-tags "$(GOTAGS)" LINTTAGS=--build-tags "$(GOTAGS)" endif -.PHONY: rclone vars version +.PHONY: rclone test_all vars version rclone: - touch fs/version.go go install -v --ldflags "-s -X github.com/rclone/rclone/fs.Version=$(TAG)" $(BUILDTAGS) cp -av `go env GOPATH`/bin/rclone . +test_all: + go install --ldflags "-s -X github.com/rclone/rclone/fs.Version=$(TAG)" $(BUILDTAGS) github.com/rclone/rclone/fstest/test_all + vars: @echo SHELL="'$(SHELL)'" @echo BRANCH="'$(BRANCH)'" @@ -50,8 +52,7 @@ version: @echo '$(TAG)' # Full suite of integration tests -test: rclone - go install --ldflags "-s -X github.com/rclone/rclone/fs.Version=$(TAG)" $(BUILDTAGS) github.com/rclone/rclone/fstest/test_all +test: rclone test_all -test_all 2>&1 | tee test_all.log @echo "Written logs in test_all.log"