summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--src/dkv/Makefile17
-rw-r--r--src/dkv/main.go2
-rw-r--r--src/dkv/main_test.go19
4 files changed, 33 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index 879e9b6..b23f09c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,7 @@
consul
.DS_Store
vendor/
+bin/
+pkg/
+target/
+src/github.com/
diff --git a/src/dkv/Makefile b/src/dkv/Makefile
index 5b7d979..6eb2941 100644
--- a/src/dkv/Makefile
+++ b/src/dkv/Makefile
@@ -1,26 +1,27 @@
GOPATH := $(shell realpath "$(PWD)/../../")
-BINARY=dkv
+BINARY := dkv
DEPENDENCIES := github.com/golang/dep/cmd/dep
export GOPATH ...
-all: build test
-deploy: build test
+all: test build
+deploy: test build
build: deps format
- echo $(GOPATH)
- $(GOPATH)/bin/dep ensure
go build -o $(GOPATH)/target/$(BINARY) -v main.go
clean:
go clean
rm -f $(GOPATH)/target/$(BINARY)
-test:
- go test -v ./api/...
+test: deps
+ go test -cover ./...
format:
- go fmt ./api/...
+ go fmt ./...
deps:
go get -u $(DEPENDENCIES)
+ $(GOPATH)/bin/dep ensure
+
+.PHONY: test
diff --git a/src/dkv/main.go b/src/dkv/main.go
index 65a300a..5d0c5b6 100644
--- a/src/dkv/main.go
+++ b/src/dkv/main.go
@@ -17,8 +17,8 @@
package main
import (
- "github.com/gorilla/mux"
"dkv/api"
+ "github.com/gorilla/mux"
"log"
"net/http"
)
diff --git a/src/dkv/main_test.go b/src/dkv/main_test.go
new file mode 100644
index 0000000..c1485fc
--- /dev/null
+++ b/src/dkv/main_test.go
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2018 Intel Corporation, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package main
+
+// TODO (sshank)