iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove tee so exit code 1 is passed up to the shell and properly fails the build when tests are failing

This commit is contained in:
Chris Bednarski 2016-02-08 20:02:56 -08:00
parent 569e6cc464
commit a36a9bf53d
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -25,7 +25,6 @@ deps:
go get github.com/mitchellh/gox go get github.com/mitchellh/gox
go get golang.org/x/tools/cmd/stringer go get golang.org/x/tools/cmd/stringer
go get golang.org/x/tools/cmd/vet go get golang.org/x/tools/cmd/vet
@echo "INFO: Packer deps are managed by godep. See CONTRIBUTING.md"
dev: deps dev: deps
@grep 'const VersionPrerelease = ""' version.go > /dev/null ; if [ $$? -eq 0 ]; then \ @grep 'const VersionPrerelease = ""' version.go > /dev/null ; if [ $$? -eq 0 ]; then \
@ -41,8 +40,7 @@ generate: deps
go fmt command/plugin.go go fmt command/plugin.go
test: deps test: deps
@echo "INFO: Test results going to packer-test.log; this may take awhile" @go test $(TEST) $(TESTARGS) -timeout=15s
@go test $(TEST) $(TESTARGS) -timeout=15s | tee packer-test.log
@go vet $(TEST) ; if [ $$? -eq 1 ]; then \ @go vet $(TEST) ; if [ $$? -eq 1 ]; then \
echo "ERROR: Vet found problems in the code."; \ echo "ERROR: Vet found problems in the code."; \
exit 1; \ exit 1; \
@ -51,11 +49,10 @@ test: deps
# testacc runs acceptance tests # testacc runs acceptance tests
testacc: deps generate testacc: deps generate
@echo "WARN: Acceptance tests will take a long time to run and may cost money. Ctrl-C if you want to cancel." @echo "WARN: Acceptance tests will take a long time to run and may cost money. Ctrl-C if you want to cancel."
PACKER_ACC=1 go test -v $(TEST) $(TESTARGS) -timeout=45m | tee packer-test-acc.log PACKER_ACC=1 go test -v $(TEST) $(TESTARGS) -timeout=45m
testrace: deps testrace: deps
@echo "INFO: Test results going to packer-test-race.log; this may take awhile" @go test -race $(TEST) $(TESTARGS) -timeout=15s
@go test -race $(TEST) $(TESTARGS) -timeout=15s | tee packer-test-race.log
updatedeps: updatedeps:
go get -u github.com/mitchellh/gox go get -u github.com/mitchellh/gox