From 7aa0c9140195a0e927fb513f22b20e0d861a7f02 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Wed, 23 Mar 2016 23:06:22 +0100 Subject: [PATCH] Add a verbose mode to builds Using the VERBOSE environment variable, tests and binary compilation are ran in verbose mode (using -v), but by default there are more quiet O:). Signed-off-by: Vincent Demeester --- Makefile | 1 + script/binary | 7 ++++++- script/test-integration | 6 +++++- script/test-unit | 4 ++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 39fed86de..1e486c8db 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ TRAEFIK_ENVS := \ -e OS_ARCH_ARG \ -e OS_PLATFORM_ARG \ -e TESTFLAGS \ + -e VERBOSE \ -e VERSION SRCS = $(shell git ls-files '*.go' | grep -v '^external/') diff --git a/script/binary b/script/binary index 506535f5f..c2451e801 100755 --- a/script/binary +++ b/script/binary @@ -8,6 +8,11 @@ fi rm -f dist/traefik +FLAGS="" +if [ -n "$VERBOSE" ]; then + FLAGS="${FLAGS} -v" +fi + if [ -z "$VERSION" ]; then VERSION=$(git rev-parse HEAD) fi @@ -17,4 +22,4 @@ if [ -z "$DATE" ]; then fi # Build binaries -CGO_ENABLED=0 GOGC=off go build -v -ldflags "-X main.Version=$VERSION -X main.BuildDate=$DATE" -a -installsuffix nocgo -o dist/traefik . +CGO_ENABLED=0 GOGC=off go build $FLAGS -ldflags "-X main.Version=$VERSION -X main.BuildDate=$DATE" -a -installsuffix nocgo -o dist/traefik . diff --git a/script/test-integration b/script/test-integration index 87d22a9e7..7905bd869 100755 --- a/script/test-integration +++ b/script/test-integration @@ -4,7 +4,11 @@ set -e export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export DEST=. -TESTFLAGS="$TESTFLAGS -test.timeout=30m -check.v" +TESTFLAGS="${TESTFLAGS} -test.timeout=30m -check.v" + +if [ -n "$VERBOSE" ]; then + TESTFLAGS="${TESTFLAGS} -v" +fi cd integration CGO_ENABLED=0 go test $TESTFLAGS diff --git a/script/test-unit b/script/test-unit index 7e43fffe6..0787ff8cf 100755 --- a/script/test-unit +++ b/script/test-unit @@ -26,6 +26,10 @@ find_dirs() { TESTFLAGS="-cover -coverprofile=cover.out ${TESTFLAGS}" +if [ -n "$VERBOSE" ]; then + TESTFLAGS="${TESTFLAGS} -v" +fi + if [ -z "$TESTDIRS" ]; then TESTDIRS=$(find_dirs '*_test.go') fi