testExec: error exec with a fakeid

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

diff --git a/Makefile b/Makefile
index f7f7a9a..a91af3f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ SYNCTHING_INOTIFY_VERSION = 0.8.7
 
 
 # Retrieve git tag/commit to set version & sub-version strings
-GIT_DESC := $(shell git describe --always --tags)
+GIT_DESC := $(shell git describe --always --tags --match "[0-9]*")
 VERSION := $(firstword $(subst -, ,$(GIT_DESC)))
 ifeq (-,$(findstring -,$(GIT_DESC)))
        SUB_VERSION := $(subst $(VERSION)-,,$(GIT_DESC))
@@ -100,16 +100,15 @@ else
        WEBAPP_BUILD_RULE=build:prod
 endif
 
-ifeq ($(SUB_VERSION), )
-       PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).zip
+# Build Package name (model: <target>_<arch>-<version>.<nb_commit_from_last_tag>.zip)
+ifeq (-g,$(findstring -g,$(GIT_DESC)))
+       NB_COMMIT=$(firstword $(subst -, ,$(SUB_VERSION)))
 else
-       # only use dot as separator to allow rpm packaging (see version .spec file)
-       PK_VER := $(subst _,.,$(subst -,,$(VERSION)))
-       PK_SBVER := $(subst _,.,$(subst -,,$(SUB_VERSION)))
-       PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(PK_VER).$(PK_SBVER).zip
+       NB_COMMIT=0
 endif
+PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).$(NB_COMMIT).zip
 
-
+.PHONY: all
 all: tools/syncthing build
 
 .PHONY: build
@@ -119,11 +118,12 @@ 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
 ifndef name
-       go test --race ./test -v
+       GOCACHE=off go test --race ./test -v
 else
-       go test --race ./test -v -run $(name)
+       GOCACHE=off go test --race ./test -v -run $(name)
 endif
 
 vet: tools/glide
@@ -144,7 +144,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
@@ -231,8 +231,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"