Code Review
/
src
/
xds
/
xds-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fixed/improved tests startup and exit
[src/xds/xds-server.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
0b40731
..
6396405
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
# 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))
VERSION := $(firstword $(subst -, ,$(GIT_DESC)))
ifeq (-,$(findstring -,$(GIT_DESC)))
SUB_VERSION := $(subst $(VERSION)-,,$(GIT_DESC))
@@
-78,8
+78,8
@@
export PATH := $(PATH):$(LOCAL_TOOLSDIR)
GOVERSION := $(shell go version |grep -o '[0-9\.]*'|head -n 1)
GOVERMAJ := $(shell echo $(GOVERSION) |cut -f1 -d.)
GOVERMIN := $(shell echo $(GOVERSION) |cut -f2 -d.)
GOVERSION := $(shell go version |grep -o '[0-9\.]*'|head -n 1)
GOVERMAJ := $(shell echo $(GOVERSION) |cut -f1 -d.)
GOVERMIN := $(shell echo $(GOVERSION) |cut -f2 -d.)
-CHECKGOVER := $(shell [ $(GOVERMAJ) -gt 1 -o \( $(GOVERMAJ) -eq 1 -a $(GOVERMIN) -ge
8
\) ] && echo true)
-CHECKERRMSG := "ERROR: Go version 1.
8.1
or higher is requested (current detected version: $(GOVERSION))."
+CHECKGOVER := $(shell [ $(GOVERMAJ) -gt 1 -o \( $(GOVERMAJ) -eq 1 -a $(GOVERMIN) -ge
9
\) ] && echo true)
+CHECKERRMSG := "ERROR: Go version 1.
9.0
or higher is requested (current detected version: $(GOVERSION))."
VERBOSE_1 := -v
VERBOSE_1 := -v
@@
-100,16
+100,15
@@
else
WEBAPP_BUILD_RULE=build:prod
endif
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
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
endif
+PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).$(NB_COMMIT).zip
-
+.PHONY: all
all: tools/syncthing build
.PHONY: build
all: tools/syncthing build
.PHONY: build
@@
-120,7
+119,7
@@
xds: scripts tools/syncthing/copytobin
@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
@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
+test:
checkgorace
tools/glide
ifndef name
GOCACHE=off go test --race ./test -v
else
ifndef name
GOCACHE=off go test --race ./test -v
else
@@
-145,7
+144,7
@@
clean:
.PHONY: distclean
distclean: 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
webapp: webapp/install
mkdir -p $(ROOT_SRCDIR)/webapp/dist $(ROOT_SRCDIR)/webapp/dist/fonts
@@
-228,12
+227,16
@@
tools/syncthing/copytobin:
checkgover:
@test "$(CHECKGOVER)" = "true" || { echo $(CHECKERRMSG); exit 1; }
checkgover:
@test "$(CHECKGOVER)" = "true" || { echo $(CHECKERRMSG); exit 1; }
+.PHONY:
+checkgorace: checkgover
+ @ls $(shell go env GOROOT)/src/runtime/race/*.syso 1> /dev/null 2>&1 || { echo "ERROR: go-race package mandatory to run test. Please install it, for example: zypper install go-race"; exit 1; }
.PHONY: help
help:
@echo "Main supported rules:"
.PHONY: help
help:
@echo "Main supported rules:"
- @echo " all
(default)"
+ @echo " all (default)"
@echo " build"
@echo " build"
+ @echo " test (use: name=TestExec to run a specific test)"
@echo " package"
@echo " install"
@echo " clean"
@echo " package"
@echo " install"
@echo " clean"