Merge branch 'master' into develop

programmfabrik · Feb 24, 2021 · 354654d · 354654d
2 parents a741df4 + a12a93c
commit 354654d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,4 @@ apitest_report.json
 *.code-workspace
 *.vscode
 *.sh
+testcoverage.out
diff --git a/Makefile b/Makefile
@@ -1,8 +1,17 @@
 all: test build
 
-test:
+vet:
 	go vet ./...
-	go test ./...
+
+fmt:
+	go fmt ./...
+
+test: fmt vet
+	go test -race -cover ./...
+
+webtest:
+	go test -coverprofile=testcoverage.out
+	go tool cover -html=testcoverage.out
 
 apitest:
 	./apitest --stop-on-fail -d test/
@@ -12,7 +21,7 @@ gox:
 	gox ${LDFLAGS} -parallel=4 -output="./bin/apitest_{{.OS}}_{{.Arch}}"
 
 clean:
-	rm -rfv ./apitest ./bin/*
+	rm -rfv ./apitest ./bin/* ./testcoverage.out
 
 build:
 	go build