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

diff --git a/Makefile b/Makefile
index 99fbb55..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,7 +154,7 @@ webapp: webapp/install
 
 webapp/install:
 	(cd webapp && npm install)
-	@[ -d ${DESTDIR}/usr ] && { echo "Removing unwanted ${DESTDIR}/usr directory"; rm -rf ${DESTDIR}/usr; }
+	@[ -d ${DESTDIR}/usr ] && { echo "Removing unwanted ${DESTDIR}/usr directory"; rm -rf ${DESTDIR}/usr; } || true
 
 .PHONY: scripts
 scripts: