Merge pull request #657 from lebauce/gotags

Makefile: rename TAGS to GOTAGS and ensure it is passed correctly

Author: safchain

Makefile

@@ -29,9 +29,10 @@ COVERAGE?=0
 COVERAGE_MODE?=atomic
 COVERAGE_WD?="."
 BOOTSTRAP_ARGS?=
+GOTAGS?=
 
 ifeq ($(WITH_DPDK), true)
-  GOTAGS= -tags dpdk
+  GOTAGS+=dpdk
 endif
 
 .PHONY: all
@@ -53,17 +54,17 @@ all: install
 	gofmt -w -s statics/bindata.go
 
 .compile:
-	${GOPATH}/bin/govendor install -ldflags="-X github.com/skydive-project/skydive/version.Version=${VERSION}" ${GOFLAGS} ${GOTAGS} ${VERBOSE_FLAGS} +local
+	${GOPATH}/bin/govendor install -ldflags="-X github.com/skydive-project/skydive/version.Version=${VERSION}" ${GOFLAGS} -tags=" ${GOTAGS}" ${VERBOSE_FLAGS} +local
 
 install: govendor genlocalfiles dpdk.build contribs .compile
 
 build: govendor genlocalfiles dpdk.build contribs
-	${GOPATH}/bin/govendor build -ldflags="-X github.com/skydive-project/skydive/version.Version=${VERSION}" ${GOFLAGS} ${GOTAGS} ${VERBOSE_FLAGS} +local
+	${GOPATH}/bin/govendor build -ldflags="-X github.com/skydive-project/skydive/version.Version=${VERSION}" ${GOFLAGS} -tags=" ${GOTAGS}" ${VERBOSE_FLAGS} +local
 
-static: govendor genlocalfiles
+static: #govendor genlocalfiles
 	rm -f $$GOPATH/bin/skydive
-	test -f /etc/redhat-release && govendor install -tags netgo --ldflags '-extldflags "-static /usr/lib64/libz.a /usr/lib64/liblzma.a /usr/lib64/libm.a"' ${VERBOSE_FLAGS} +local || true
-	test -f /etc/debian_version && govendor install -tags netgo --ldflags '-extldflags "-static /usr/lib/x86_64-linux-gnu/libz.a /usr/lib/x86_64-linux-gnu/liblzma.a /usr/lib/x86_64-linux-gnu/libicuuc.a /usr/lib/x86_64-linux-gnu/libicudata.a /usr/lib/x86_64-linux-gnu/libxml2.a /usr/lib/x86_64-linux-gnu/libc.a /usr/lib/x86_64-linux-gnu/libdl.a /usr/lib/x86_64-linux-gnu/libpthread.a /usr/lib/x86_64-linux-gnu/libc++.a /usr/lib/x86_64-linux-gnu/libm.a"' ${VERBOSE_FLAGS} +local || true
+	test -f /etc/redhat-release && govendor install -tags netgo --ldflags '-extldflags "-static /usr/lib64/libz.a /usr/lib64/liblzma.a /usr/lib64/libm.a"' ${VERBOSE_FLAGS} -tags " ${GOTAGS}" +local || true
+	test -f /etc/debian_version && govendor install -tags netgo --ldflags '-extldflags "-static /usr/lib/x86_64-linux-gnu/libz.a /usr/lib/x86_64-linux-gnu/liblzma.a /usr/lib/x86_64-linux-gnu/libicuuc.a /usr/lib/x86_64-linux-gnu/libicudata.a /usr/lib/x86_64-linux-gnu/libxml2.a /usr/lib/x86_64-linux-gnu/libc.a /usr/lib/x86_64-linux-gnu/libdl.a /usr/lib/x86_64-linux-gnu/libpthread.a /usr/lib/x86_64-linux-gnu/libc++.a /usr/lib/x86_64-linux-gnu/libm.a"' ${VERBOSE_FLAGS} -tags " ${GOTAGS}" +local || true
 
 contribs:
 	$(MAKE) -C contrib/snort
@@ -86,7 +87,7 @@ test.functionals.cleanup:
 	rm -f tests/functionals
 
 test.functionals.compile: govendor genlocalfiles
-	${GOPATH}/bin/govendor test -tags "${TAGS} test" ${GOFLAGS} ${VERBOSE_FLAGS} -timeout ${TIMEOUT} -c -o tests/functionals ./tests/
+	${GOPATH}/bin/govendor test -tags "${GOTAGS} test" ${GOFLAGS} ${VERBOSE_FLAGS} -timeout ${TIMEOUT} -c -o tests/functionals ./tests/
 
 test.functionals.run:
 	cd tests && sudo -E ./functionals ${VERBOSE_TESTS_FLAGS} -test.timeout ${TIMEOUT} ${ARGS}
@@ -116,12 +117,12 @@ ifeq ($(COVERAGE), true)
 	for pkg in ${UT_PACKAGES}; do \
 		if [ -n "$$pkg" ]; then \
 			coverfile="${COVERAGE_WD}/$$(echo $$pkg | tr / -).cover"; \
-			${GOPATH}/bin/govendor test -tags "${TAGS} test" -covermode=${COVERAGE_MODE} -coverprofile="$$coverfile" ${VERBOSE_FLAGS} -timeout ${TIMEOUT} $$pkg; \
+			${GOPATH}/bin/govendor test -tags "${GOTAGS} test" -covermode=${COVERAGE_MODE} -coverprofile="$$coverfile" ${VERBOSE_FLAGS} -timeout ${TIMEOUT} $$pkg; \
 		fi; \
 	done
 else
 	set -v ; \
-	${GOPATH}/bin/govendor test -tags "${TAGS} test" ${GOFLAGS} ${VERBOSE_FLAGS} -timeout ${TIMEOUT} ${UT_PACKAGES}
+	${GOPATH}/bin/govendor test -tags "${GOTAGS} test" ${GOFLAGS} ${VERBOSE_FLAGS} -timeout ${TIMEOUT} ${UT_PACKAGES}
 endif
 
 govendor:

coverage.sh

@@ -53,7 +53,7 @@ generate_cover_data() {
         curl -XDELETE 'localhost:9200/skydive*'
         $SKYDIVE compile
 
-        make test.functionals TAGS="scale" VERBOSE=true TIMEOUT=10m TEST_PATTERN=Scale
+        make test.functionals GOTAGS="scale" VERBOSE=true TIMEOUT=10m TEST_PATTERN=Scale
         cp /tmp/skydive-scale/*.cover "$workdir"/
     fi
 

scripts/ci/run-cdd-overview-tests.sh

@@ -19,7 +19,7 @@ export ELASTICSEARCH=localhost:9200
 export SKYDIVE=${GOPATH}/bin/skydive
 export SKYDIVE_LOGGING_LEVEL=DEBUG
 
-make test.functionals TAGS="cdd" VERBOSE=true TIMEOUT=10m TEST_PATTERN=Overview
+make test.functionals GOTAGS="cdd" VERBOSE=true TIMEOUT=10m TEST_PATTERN=Overview
 
 "${dir}/convert-to-gif.sh" tests/overview.mp4 tests/overview-tmp.gif
 gifsicle -O3 tests/overview-tmp.gif -o tests/overview.gif

scripts/ci/run-functional-tests.sh

@@ -18,16 +18,14 @@ case "$BACKEND" in
   "orientdb")
     export ORIENTDB_ROOT_PASSWORD=root
     ARGS="-graph.backend orientdb -storage.backend orientdb"
-    TAGS="storage"
     ;;
   "elasticsearch")
     ARGS="-graph.backend elasticsearch -storage.backend elasticsearch"
-    TAGS="storage"
     ;;
 esac
 
 set -e
-make test.functionals.batch TAGS="$TAGS" GOFLAGS="$GOFLAGS" GORACE="history_size=5" VERBOSE=true TIMEOUT=20m COVERAGE=$COVERAGE ARGS="$ARGS -graph.output ascii -standalone -etcd.server http://localhost:2379" TEST_PATTERN=$TEST_PATTERN 2>&1 | tee $WORKSPACE/output.log
+make test.functionals.batch GOTAGS="$GOTAGS" GOFLAGS="$GOFLAGS" GORACE="history_size=5" VERBOSE=true TIMEOUT=20m COVERAGE=$COVERAGE ARGS="$ARGS -graph.output ascii -standalone -etcd.server http://localhost:2379" TEST_PATTERN=$TEST_PATTERN 2>&1 | tee $WORKSPACE/output.log
 go2xunit -fail -fail-on-race -input $WORKSPACE/output.log -output $WORKSPACE/tests.xml
 set +e
 

scripts/ci/run-openstack-tests.sh

@@ -10,4 +10,4 @@ export GOROOT=/opt/go
 export GOPATH=/opt/stack/go
 export GO_VERSION=1.7
 cd /opt/stack/go/src/github.com/skydive-project/skydive/
-SKYDIVE_ANALYZERS=localhost:8082 make test.functionals TAGS="neutron" VERBOSE=true TIMEOUT=5m TEST_PATTERN=Neutron
+SKYDIVE_ANALYZERS=localhost:8082 make test.functionals GOTAGS="neutron" VERBOSE=true TIMEOUT=5m TEST_PATTERN=Neutron

scripts/ci/run-scale.sh

@@ -24,7 +24,7 @@ export SKYDIVE=${GOPATH}/bin/skydive
 export FLOW_PROTOCOL=${FLOW_PROTOCOL}
 export SKYDIVE_LOGGING_LEVEL=DEBUG
 
-make test.functionals TAGS="scale" VERBOSE=true TIMEOUT=10m TEST_PATTERN=Scale
+make test.functionals GOTAGS="scale" VERBOSE=true TIMEOUT=10m TEST_PATTERN=Scale
 status=$?
 
 cat /tmp/skydive-scale/{analyzer,agent}-?.log | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[mGK]//g" | perl -ne '$d=$1 if /^(\d+-\d+-\d+),/; $k{$d}.=$_; END{print $k{$_} for sort keys(%k);}'

scripts/ci/run-selenium-tests.sh

@@ -18,4 +18,4 @@ make install
 export SKYDIVE_ANALYZERS=localhost:8082
 export SKYDIVE=${GOPATH}/bin/skydive
 
-make test.functionals TAGS="selenium" VERBOSE=true TIMEOUT=10m TEST_PATTERN=PacketInjectionCapture ARGS="$ARGS -standalone"
+make test.functionals GOTAGS="selenium" VERBOSE=true TIMEOUT=10m TEST_PATTERN=PacketInjectionCapture ARGS="$ARGS -standalone"