summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorhmhealey <harrisonmhealey@gmail.com>2015-11-27 16:36:57 -0500
committerhmhealey <harrisonmhealey@gmail.com>2015-11-30 09:12:57 -0500
commite5a2467c860fc8a40108edb968e82253abcb4ea1 (patch)
tree1fe9a705db30cbba8b247a2f19417ba09e654272 /Makefile
parentce259ad7f1ce8a52b7fc5af7542a101acf71173e (diff)
downloadchat-e5a2467c860fc8a40108edb968e82253abcb4ea1.tar.gz
chat-e5a2467c860fc8a40108edb968e82253abcb4ea1.tar.bz2
chat-e5a2467c860fc8a40108edb968e82253abcb4ea1.zip
Added .prepare step to make test
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 87219e68c..06f14c31d 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ dist: | build-server build-client go-test package
mv ./model/version.go.bak ./model/version.go
dist-local: | start-docker dist
-
+
dist-travis: | travis-init build-container
start-docker:
@@ -153,7 +153,7 @@ go-test:
$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./utils || exit 1
$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./web || exit 1
-test: | start-docker go-test
+test: | start-docker .prepare go-test
travis-init:
@echo Setting up enviroment for travis