Merge pull request #12988 from hashicorp/jbardin/travis

test changes to travis
This commit is contained in:
James Bardin 2017-03-22 18:14:54 -04:00 committed by GitHub
commit c105784c60
1 changed files with 1 additions and 1 deletions

View File

@ -41,7 +41,7 @@ plugin-dev: generate
test: fmtcheck errcheck generate test: fmtcheck errcheck generate
go test -i $(TEST) || exit 1 go test -i $(TEST) || exit 1
echo $(TEST) | \ echo $(TEST) | \
xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4 xargs -t -n4 go test $(TESTARGS) -timeout=60s -parallel=4
# testacc runs acceptance tests # testacc runs acceptance tests
testacc: fmtcheck generate testacc: fmtcheck generate