X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=0b4073153caf620b54c2452453a43fd697bb7949;hb=refs%2Fheads%2Fflounder;hp=d4f86b297b43e6c483f881a01949d4f2eb924a78;hpb=f870de867b43bfb1220067f81c11395438fb2863;p=src%2Fxds%2Fxds-server.git

diff --git a/Makefile b/Makefile
index d4f86b2..0b40731 100644
--- a/Makefile
+++ b/Makefile
@@ -119,8 +119,13 @@ xds: scripts tools/syncthing/copytobin
 	@echo "### Build XDS server (version $(VERSION), subversion $(SUB_VERSION)) - $(BUILD_MODE)";
 	@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/$(TARGET)$(EXT) -ldflags "$(GO_LDFLAGS) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" -gcflags "$(GO_GCFLAGS)" .
 
+.PHONY: test
 test: tools/glide
-	go test --race $(shell $(LOCAL_TOOLSDIR)/glide novendor)
+ifndef name
+	GOCACHE=off go test --race ./test -v
+else
+	GOCACHE=off go test --race ./test -v -run $(name)
+endif
 
 vet: tools/glide
 	go vet $(shell $(LOCAL_TOOLSDIR)/glide novendor)
@@ -149,6 +154,7 @@ webapp: webapp/install
 
 webapp/install:
 	(cd webapp && npm install)
+	@[ -d ${DESTDIR}/usr ] && { echo "Removing unwanted ${DESTDIR}/usr directory"; rm -rf ${DESTDIR}/usr; } || true
 
 .PHONY: scripts
 scripts:
@@ -162,9 +168,9 @@ conffile:
 
 .PHONY: install
 install:
-	@test -e $(LOCAL_BINDIR)/xds-server$(EXT) -a -d webapp/dist || { echo "Please execute first: make all\n"; exit 1; }
-	@test -d $(LOCAL_BINDIR)/xds-utils || { echo "Please execute first: make all\n"; exit 1; }
-	@test -e $(LOCAL_BINDIR)/syncthing$(EXT) -a -e $(LOCAL_BINDIR)/syncthing-inotify$(EXT) || { echo "Please execute first: make all\n"; exit 1; }
+	@test -e $(LOCAL_BINDIR)/xds-server$(EXT) -a -d webapp/dist || { echo "Please execute first: make all"; exit 1; }
+	@test -d $(LOCAL_BINDIR)/xds-utils || { echo "Please execute first: make all"; exit 1; }
+	@test -e $(LOCAL_BINDIR)/syncthing$(EXT) -a -e $(LOCAL_BINDIR)/syncthing-inotify$(EXT) || { echo "Please execute first: make all"; exit 1; }
 	mkdir -p $(DESTDIR) \
 		&& cp -a $(LOCAL_BINDIR)/* $(DESTDIR)
 	mkdir -p $(DESTDIR_WWW) \