Put source in root dir to make importing easier (this is ugly go for …

…you)
memcachier · Jun 5, 2018 · b0f42f4 · b0f42f4
1 parent 912091a
commit b0f42f4
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -7,24 +7,24 @@ endif
 
 all: build
 
-build: src/mc/*.go
-	@GOPATH=$(CURDIR) $(GO) build mc
+build: *.go
+	$(GO) build
 
 test: build
 	@memcached -p 11289 & echo $$! > test.pids
-	@GOPATH=$(CURDIR) $(GO) test -test.short -v mc; ST=$?; \
+	@GOPATH=$(CURDIR) $(GO) test -test.short -v; ST=$?; \
 	cd $(CURDIR); cat test.pids | xargs kill; rm test.pids
 	@exit ${ST}
 
 test-full: build
 	@memcached -p 11289 & echo $$! > test.pids
-	@GOPATH=$(CURDIR) GO15VENDOREXPERIMENT=1 $(GO) test -v mc; ST=$?; \
+	@GOPATH=$(CURDIR) GO15VENDOREXPERIMENT=1 $(GO) test -v; ST=$?; \
 	cd $(CURDIR); cat test.pids | xargs kill; rm test.pids
 	@exit ${ST}
 
 bench: build
 	@memcached -p 11289 & echo $$! > test.pids
-	@GOPATH=$(CURDIR) $(GO) test -run "notests" -bench ".*" mc; ST=$?; \
+	@GOPATH=$(CURDIR) $(GO) test -run "notests" -bench ".*"; ST=$?; \
 	cd $(CURDIR); cat test.pids | xargs kill; rm test.pids
 	@exit ${ST}
 

diff --git a/src/mc/bench_test.go → bench_test.go b/src/mc/bench_test.go → bench_test.go
diff --git a/src/mc/client.go → client.go b/src/mc/client.go → client.go
diff --git a/src/mc/client_test.go → client_test.go b/src/mc/client_test.go → client_test.go
diff --git a/src/mc/config.go → config.go b/src/mc/config.go → config.go
diff --git a/src/mc/failure_test.go → failure_test.go b/src/mc/failure_test.go → failure_test.go
diff --git a/src/mc/hasher.go → hasher.go b/src/mc/hasher.go → hasher.go
diff --git a/src/mc/mock_conn.go → mock_conn.go b/src/mc/mock_conn.go → mock_conn.go
diff --git a/src/mc/protocol.go → protocol.go b/src/mc/protocol.go → protocol.go
diff --git a/src/mc/server.go → server.go b/src/mc/server.go → server.go
diff --git a/src/mc/server_conn.go → server_conn.go b/src/mc/server_conn.go → server_conn.go
diff --git a/src/mc/utils_test.go → utils_test.go b/src/mc/utils_test.go → utils_test.go