fileconfig: env variables after default values

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

diff --git a/Makefile b/Makefile
index 295650b..64ba5a3 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 ./test -v
+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