Fix tests

[src/xds/xds-server.git] / Makefile

diff --git a/Makefile b/Makefile
index d4f86b2..f0ae0b3 100644 (file)
--- 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)
@@ -140,7 +145,7 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-       (cd $(ROOT_SRCDIR) && rm -rf $(LOCAL_BINDIR) ./tools ./glide.lock ./vendor ./*.zip ./webapp/dist ./webapp/node_modules)
+       (cd $(ROOT_SRCDIR) && rm -rf $(LOCAL_BINDIR) ./tools ./glide.lock ./vendor ./*.zip ./webapp/dist ./webapp/node_modules ./scripts/sdks/agl/sdks_*.json)
 
 webapp: webapp/install
        mkdir -p $(ROOT_SRCDIR)/webapp/dist $(ROOT_SRCDIR)/webapp/dist/fonts
@@ -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) \
@@ -226,8 +232,9 @@ checkgover:
 .PHONY: help
 help:
        @echo "Main supported rules:"
-       @echo "  all                (default)"
+       @echo "  all         (default)"
        @echo "  build"
+       @echo "  test        (use: name=TestExec to run a specific test)"
        @echo "  package"
        @echo "  install"
        @echo "  clean"