From 824b51eb84ea2d90bbe81437583b3d0a18d25126 Mon Sep 17 00:00:00 2001 From: Jeffrey Regan Date: Tue, 13 Feb 2018 13:20:03 -0800 Subject: [PATCH] Make test failures easier to see and understand. --- pre-commit.sh | 51 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/pre-commit.sh b/pre-commit.sh index 551c659540..4774736d95 100755 --- a/pre-commit.sh +++ b/pre-commit.sh @@ -10,28 +10,47 @@ cd "$base_dir" || { rc=0 -go_dirs() { +function go_dirs { go list -f '{{.Dir}}' ./... | tr '\n' '\0' } -echo "Running go fmt" -diff <(echo -n) <(go_dirs | xargs -0 gofmt -s -d -l) -rc=$((rc || $?)) +function runTest { + local name=$1 + local result="SUCCESS" + printf "============== begin %s\n" "$name" + $name + local code=$? + rc=$((rc || $code)) + if [ $code -ne 0 ]; then + result="FAILURE" + fi + printf "============== end %s : %s code=%d\n\n\n" "$name" "$result" $code +} + +function testGoFmt { + diff <(echo -n) <(go_dirs | xargs -0 gofmt -s -d -l) +} + +function testGoImports { + diff -u <(echo -n) <(go_dirs | xargs -0 goimports -l) +} -echo "Running goimports" -diff -u <(echo -n) <(go_dirs | xargs -0 goimports -l) -rc=$((rc || $?)) +function testGoVet { + go vet -all ./... +} -echo "Running go vet" -go vet -all ./... -rc=$((rc || $?)) +function testGoTest { + go test -v ./... +} -echo "Running go test" -go test -v ./... -rc=$((rc || $?)) +function testTutorial { + mdrip --mode test --label test ./cmd/kinflate +} -echo "Testing kinflate demos" -mdrip --mode test --label test ./cmd/kinflate -rc=$((rc || $?)) +runTest testGoFmt +runTest testGoImports +runTest testGoVet +runTest testGoTest +runTest testTutorial exit $rc