test: update

Makefile

@@ -3,9 +3,7 @@ export GO15VENDOREXPERIMENT := 1
 
 all: fmt build
 
-build: frps frpc build_test
-
-build_test: echo_server http_server
+build: frps frpc
 
 # compile assets into binary file
 assets:
@@ -15,16 +13,8 @@ assets:
 	go generate ./assets/...
 
 fmt:
-	@go fmt ./assets/...
-	@go fmt ./cmd/...
-	@go fmt ./client/...
-	@go fmt ./server/...
-	@go fmt ./models/...
-	@go fmt ./utils/...
-	@go fmt ./test/echo_server.go
-	@go fmt ./test/http_server.go
-	@go fmt ./test/func_test.go
-
+	go fmt ./...
+	
 frps:
 	go build -o bin/frps ./cmd/frps
 	@cp -rf ./assets/static ./bin
@@ -32,29 +22,25 @@ frps:
 frpc:
 	go build -o bin/frpc ./cmd/frpc
 
-echo_server:
-	go build -o test/bin/echo_server ./test/echo_server.go
-
-http_server:
-	go build -o test/bin/http_server ./test/http_server.go
-
 test: gotest
 
 gotest:
-	go test -v ./...
+	go test -v ./assets/...
+	go test -v ./client/...
+	go test -v ./cmd/...
+	go test -v ./models/...
+	go test -v ./server/...
+	go test -v ./utils/...
 
-alltest:
+alltest: gotest
 	cd ./test && ./run_test.sh && cd -
-	go test -v ./src/...
-	go test -v ./test/func_test.go
+	go test -v ./tests/...
 	cd ./test && ./clean_test.sh && cd -
 
 clean:
 	rm -f ./bin/frpc
 	rm -f ./bin/frps
-	rm -f ./test/bin/echo_server
-	rm -f ./test/bin/http_server
 	cd ./test && ./clean_test.sh && cd -
 
 save:
-	godep save ./src/...
+	godep save ./...