Skip to content

Commit

Permalink
Merge pull request #2722 from terraform-providers/jbardin/update-core…
Browse files Browse the repository at this point in the history
…-vendor

update vendor
  • Loading branch information
jbardin authored Jan 10, 2018
2 parents be67974 + 65b0601 commit 7159451
Show file tree
Hide file tree
Showing 1,238 changed files with 2,534 additions and 390,728 deletions.
9 changes: 3 additions & 6 deletions GNUmakefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
SWEEP?=us-east-1,us-west-2
TEST?=$$(go list ./... |grep -v 'vendor')
GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)

default: build
Expand All @@ -9,15 +8,13 @@ build: fmtcheck

sweep:
@echo "WARNING: This will destroy infrastructure. Use only in development accounts."
go test $(TEST) -v -sweep=$(SWEEP) $(SWEEPARGS)
go test ./... -v -sweep=$(SWEEP) $(SWEEPARGS)

test: fmtcheck
go test -i $(TEST) || exit 1
echo $(TEST) | \
xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4
go test ./... -timeout=30s -parallel=4

testacc: fmtcheck
TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m
TF_ACC=1 go test ./... -v $(TESTARGS) -timeout 120m

vet:
@echo "go vet ."
Expand Down
202 changes: 0 additions & 202 deletions vendor/cloud.google.com/go/LICENSE

This file was deleted.

Loading

0 comments on commit 7159451

Please sign in to comment.