diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-10-03T09·16+0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-10-03T09·16+0200 |
| commit | c6676ea253e6402760435b1a3cff53d294e4a9fd (patch) | |
| tree | 468a59079549a6f893873e9b41a5f0b054a4f610 | |
| parent | fce24b7d6caec14645cafebf4cecb5b150761796 (diff) | |
| parent | 60ecbd793457d0951273ff35df90aaeb950188c0 (diff) | |
Merge branch 'elegant-tests' of https://github.com/copumpkin/nix
| -rw-r--r-- | mk/tests.mk | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/mk/tests.mk b/mk/tests.mk index 004a48028616..aa97d6427ccc 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -7,20 +7,38 @@ define run-install-test endef +# Color code from https://unix.stackexchange.com/a/10065 installcheck: - @total=0; failed=0; for i in $(_installcheck-list); do \ + @total=0; failed=0; \ + pad=" "; \ + red=""; \ + green=""; \ + normal=""; \ + if [ -t 1 ]; then \ + ncolors="$$(tput colors)"; \ + if [[ -n "$$ncolors" && $$ncolors -ge 8 ]]; then \ + red="$$(tput setaf 1)"; \ + green="$$(tput setaf 2)"; \ + normal="$$(tput sgr0)"; \ + fi; \ + fi; \ + for i in $(_installcheck-list); do \ total=$$((total + 1)); \ - echo "running test $$i"; \ - if (cd $$(dirname $$i) && $(tests-environment) $$(basename $$i)); then \ - echo "PASS: $$i"; \ + printf "running test $$i... $${pad:$${#i}}"; \ + log="$$(cd $$(dirname $$i) && $(tests-environment) $$(basename $$i) 2>&1)"; \ + if [ $$? == 0 ]; then \ + echo "[$${green}PASS$$normal]"; \ else \ - echo "FAIL: $$i"; \ + echo "[$${red}FAIL$$normal]"; \ + echo "$$log" | sed 's/^/ /'; \ failed=$$((failed + 1)); \ fi; \ done; \ if [ "$$failed" != 0 ]; then \ - echo "$$failed out of $$total tests failed "; \ + echo "$${red}$$failed out of $$total tests failed $$normal"; \ exit 1; \ + else \ + echo "$${green}All tests succeeded"; \ fi .PHONY: check installcheck |