From 910db8d133e9ffdc80dd0eba5d27ac8b7f0a53cf Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 20 Aug 2019 16:20:41 +0200 Subject: [PATCH 1/7] Setup travis --- .travis.yml | 8 ++++++++ test | 5 +++++ 2 files changed, 13 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..9a3f3ee --- /dev/null +++ b/.travis.yml @@ -0,0 +1,8 @@ +language: go + +os: + - linux + - windows + +script: + - test diff --git a/test b/test index 8d4f69d..a97ea69 100755 --- a/test +++ b/test @@ -46,9 +46,14 @@ function run { baseDir="$( cd "$(dirname "$0")" && pwd )" cd "$baseDir" +# platform info +platformInfo=$(go env GOOS GOARCH) +echo "running tests for ${platformInfo//$'\n'/ }" + # get all packages packages=$(go list ./...) +# run vet/test on packages for package in $packages; do run go vet $package run go test -cover $package From eae612da8bd8736aa848309c4658514b1ff15e06 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 20 Aug 2019 16:42:28 +0200 Subject: [PATCH 2/7] Fix travis config, update test script --- .travis.yml | 3 +-- test | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9a3f3ee..444e273 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,5 +4,4 @@ os: - linux - windows -script: - - test +script: ./test diff --git a/test b/test index a97ea69..f16bb3c 100755 --- a/test +++ b/test @@ -30,7 +30,7 @@ function run { fi else if [[ $output == *"build constraints exclude all Go files"* ]]; then - echo -e "\e[1A[\e[01;33mNOTEST\e[00m] $*" + echo -e "\e[1A[ !OS ] $*" warnings=$((warnings+1)) else echo -e "\e[1A[\e[01;31m FAIL \e[00m] $*" >/dev/stderr From 0473b9c528d8249a38b66999a838c9553ded3731 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 20 Aug 2019 16:51:45 +0200 Subject: [PATCH 3/7] Specify custom install --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 444e273..0ecd4ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,5 @@ os: - linux - windows +install: dep ensure script: ./test From c36f3a730755b100ff85bd61bbe3fd337e968ae5 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 20 Aug 2019 17:11:20 +0200 Subject: [PATCH 4/7] Install dep --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0ecd4ac..c4f55ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,5 +4,9 @@ os: - linux - windows -install: dep ensure +install: + - go get -d -u github.com/golang/dep + - go install github.com/golang/dep/cmd/dep + - dep ensure + script: ./test From c2d7ba143e6b98d5ace23a75e14145c4180a5669 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 20 Aug 2019 21:25:22 +0200 Subject: [PATCH 5/7] Fix test script formatting --- .travis.yml | 2 +- test | 22 ++++++++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index c4f55ca..ff6eac8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,4 +9,4 @@ install: - go install github.com/golang/dep/cmd/dep - dep ensure -script: ./test +script: ./test --scripted diff --git a/test b/test index f16bb3c..46fdf5d 100755 --- a/test +++ b/test @@ -2,9 +2,13 @@ warnings=0 errors=0 +scripted=0 +goUp="\\e[1A" function run { - echo "[......] $*" + if [[ $scripted -eq 0 ]]; then + echo "[......] $*" + fi # create tmpfile tmpfile=$(mktemp) @@ -16,10 +20,10 @@ function run { # check return code if [[ $rc -eq 0 ]]; then if [[ $output == *"[no test files]"* ]]; then - echo -e "\e[1A[\e[01;33mNOTEST\e[00m] $*" + echo -e "${goUp}[\e[01;33mNOTEST\e[00m] $*" warnings=$((warnings+1)) else - echo -ne "\e[1A[\e[01;32m OK \e[00m] " + echo -ne "${goUp}[\e[01;32m OK \e[00m] " if [[ $2 == "test" ]]; then echo -n $* echo -n ": " @@ -30,10 +34,10 @@ function run { fi else if [[ $output == *"build constraints exclude all Go files"* ]]; then - echo -e "\e[1A[ !OS ] $*" + echo -e "${goUp}[ !OS ] $*" warnings=$((warnings+1)) else - echo -e "\e[1A[\e[01;31m FAIL \e[00m] $*" >/dev/stderr + echo -e "${goUp}[\e[01;31m FAIL \e[00m] $*" >/dev/stderr cat $tmpfile >/dev/stderr errors=$((errors+1)) fi @@ -46,9 +50,15 @@ function run { baseDir="$( cd "$(dirname "$0")" && pwd )" cd "$baseDir" +# change output format if being run in script +if [[ $1 == "--scripted" ]]; then + scripted=1 + goUp="" +fi + # platform info platformInfo=$(go env GOOS GOARCH) -echo "running tests for ${platformInfo//$'\n'/ }" +echo "running tests for ${platformInfo//$'\n'/ }:" # get all packages packages=$(go list ./...) From b8c8abf793091e9ecd949067c2e2e235d11310d7 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 20 Aug 2019 21:34:26 +0200 Subject: [PATCH 6/7] Add branch selection --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index ff6eac8..86b32d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,12 @@ os: - linux - windows +branches: + only: + - master + - /^feature\/travis\/.+$/ # feature/travis/* + - /^fix\/travis\/.+$/ # fix/travis/* + install: - go get -d -u github.com/golang/dep - go install github.com/golang/dep/cmd/dep From e4889b0d77a588178feba1d47b24d4c8a5f9a4d7 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 20 Aug 2019 21:41:52 +0200 Subject: [PATCH 7/7] Do not count packages excluded by constraint as warning --- test | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test b/test index 46fdf5d..5f82181 100755 --- a/test +++ b/test @@ -34,8 +34,7 @@ function run { fi else if [[ $output == *"build constraints exclude all Go files"* ]]; then - echo -e "${goUp}[ !OS ] $*" - warnings=$((warnings+1)) + echo -e "${goUp}[ !=OS ] $*" else echo -e "${goUp}[\e[01;31m FAIL \e[00m] $*" >/dev/stderr cat $tmpfile >/dev/stderr