Unit tests are now triggered by build tags.

1 files changed, 9 insertions, 13 deletions

diff --git a/app/Makefile b/app/Makefile
index e10dbc4..c847c75 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -28,14 +28,10 @@ APP:=statuspage
 all: kill build run
 
 clean: kill
-	@echo "Removing import file..."
-	@rm $(IMPORT_FILE) || true
-	@echo "Removing sqlite3 database..."
-	@rm $(STATUS_DB_CREDENTIALS) || true
-	@echo "Removing tar archiv..."
-	@rm ../$(APP).tar.gz 1>&2 2>/dev/null || true
-	@echo "Removing binary..."
-	@rm $(APP)
+	@(rm $(IMPORT_FILE) 2>/dev/null && echo "Removing import file..." ) || true
+	@(rm $(STATUS_DB_CREDENTIALS) 2>/dev/null && echo "Removing sqlite3 database..." ) || true
+	@(rm ../$(APP).tar.gz 1>&2 2>/dev/null echo && "Removing tar archiv...") || true
+	@(rm $(APP) && echo "Removing binary ($(APP))...") || true
 	@echo "Done."
 
 build: import
@@ -80,10 +76,10 @@ pack:
 	(echo "Run \"make build\" first." && exit 1)
 
 test:
-	go test -race -run '^(Database|Redis)'
+	go test -v -race -tags general
 
-test_all:
-	go test -race
+test_all: import
+	go test -v -race -tags all
 
-test_dependencies:
-	go test -race -run '(Database|Redis)'
+test_dependencies: import
+	go test -v -race -tags dep