From 737f844e9a9d9981b29a163107d4fcf4d3781cf5 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 23 Mar 2016 19:00:43 +0200
Subject: [PATCH] Fix travis

Need to install deps and generate doesn't exist on older go (and isn't
used in this project anyway)
---
 .travis.yml |  2 +-
 Makefile    | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1742602..884ffa4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ go:
   - 1.6
   - tip
 
-script: make test testrace
+script: make updatedeps test testrace
 
 matrix:
   allow_failures:
diff --git a/Makefile b/Makefile
index 0ce0b7a..4874b00 100644
--- a/Makefile
+++ b/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