From 0a5aadc8b2445c95063836962374db4ed532e858 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Mon, 23 Nov 2015 10:46:21 -0500
Subject: Moving removal of data directory to nuke. Updating dev setup.

---
 Makefile               | 8 +++++---
 doc/developer/Setup.md | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 7e0687d76..8e7cfe3ed 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ DOCKER_CONTAINER_NAME ?= mm-test
 
 all: dist-local
 
-dist: | build-server build-client test package
+dist: | build-server build-client go-test package
 	mv ./model/version.go.bak ./model/version.go
 
 dist-local: | start-docker dist
@@ -143,13 +143,15 @@ build-client:
 
 	cd web/sass-files && compass compile -e production --force
 
-test:
+go-test:
 	$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=180s ./api || exit 1
 	$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=12s ./model || exit 1
 	$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./store || exit 1
 	$(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
+
 travis-init:
 	@echo Setting up enviroment for travis
 
@@ -205,7 +207,6 @@ clean: stop-docker
 	rm -f web/static/js/libs*.js
 	rm -f web/static/css/styles.css
 
-	rm -rf data
 	rm -rf api/data
 	rm -rf logs
 	rm -rf web/sass-files/.sass-cache
@@ -216,6 +217,7 @@ clean: stop-docker
 	rm -f .prepare
 
 nuke: | clean clean-docker
+	rm -rf data
 
 .prepare:
 	@echo Preparation for run step
diff --git a/doc/developer/Setup.md b/doc/developer/Setup.md
index e78d4dff2..882aac530 100644
--- a/doc/developer/Setup.md
+++ b/doc/developer/Setup.md
@@ -11,7 +11,7 @@ Developer Machine Setup
 		`docker-machine ip dev`
 	3. Add a line to your /etc/hosts that goes `<Docker IP> dockerhost`
 	4. Run `docker-machine env dev` and copy the export statements to your ~/.bash_profile
-2. Download Go (version 1.4.2 or 1.5.1. Final release bits are built with 1.4.2) from http://golang.org/dl/
+2. Download Go 1.5.1 from http://golang.org/dl/
 3. Set up your Go workspace
 	1. `mkdir ~/go`
 	2. Add the following to your ~/.bash_profile  
@@ -53,7 +53,7 @@ Any issues? Please let us know on our forums at: http://forum.mattermost.org
 		`127.0.0.1 dockerhost`
 3. Install build essentials
 	1. `apt-get install build-essential`
-4. Download Go (version 1.4.2 or 1.5.1. Final release bits are built with 1.4.2) from http://golang.org/dl/
+4. Download Go 1.5.1 from http://golang.org/dl/
 5. Set up your Go workspace and add Go to the PATH
 	1. `mkdir ~/go`
 	2. Add the following to your ~/.bashrc  
-- 
cgit v1.2.3-1-g7c22