Merge pull request #37 from sethvargo/sethvargo/travis_oops

Fix travis

.travis.yml

@@ -10,7 +10,7 @@ go:
   - 1.6
   - tip
 
-script: make test testrace
+script: make updatedeps test testrace
 
 matrix:
   allow_failures:

Makefile

@@ -3,11 +3,11 @@ TEST?=./...
 default: test
 
 # test runs the test suite and vets the code
-test: generate
+test:
 	go list $(TEST) | xargs -n1 go test -timeout=60s -parallel=10 $(TESTARGS)
 
 # testrace runs the race checker
-testrace: generate
+testrace:
 	go list $(TEST) | xargs -n1 go test -race $(TESTARGS)
 
 # updatedeps installs all the dependencies to run and build
@@ -17,9 +17,4 @@ updatedeps:
 		| grep -v github.com/mitchellh/cli \
 		| xargs go get -f -u -v
 
-# generate runs `go generate` to build the dynamically generated source files
-generate:
-	find . -type f -name '.DS_Store' -delete
-	go generate ./...
-
-.PHONY: test testrace updatedeps generate
+.PHONY: test testrace updatedeps