More elegant test output
I got sick of trying to find the failures in the sea of debug output, so we now: - Hide test output unless it fails - Sprinkle in some simple color - Pad results for a more tabular look If Nix is getting a more friendly user interface, we might as well get a friendlier developer interface, right? :)
This commit is contained in:
parent
f3e0d46821
commit
60ecbd7934
1 changed files with 24 additions and 6 deletions
30
mk/tests.mk
30
mk/tests.mk
|
@ -7,20 +7,38 @@ define run-install-test
|
||||||
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
# Color code from https://unix.stackexchange.com/a/10065
|
||||||
installcheck:
|
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)); \
|
total=$$((total + 1)); \
|
||||||
echo "running test $$i"; \
|
printf "running test $$i... $${pad:$${#i}}"; \
|
||||||
if (cd $$(dirname $$i) && $(tests-environment) $$(basename $$i)); then \
|
log="$$(cd $$(dirname $$i) && $(tests-environment) $$(basename $$i) 2>&1)"; \
|
||||||
echo "PASS: $$i"; \
|
if [ $$? == 0 ]; then \
|
||||||
|
echo "[$${green}PASS$$normal]"; \
|
||||||
else \
|
else \
|
||||||
echo "FAIL: $$i"; \
|
echo "[$${red}FAIL$$normal]"; \
|
||||||
|
echo "$$log" | sed 's/^/ /'; \
|
||||||
failed=$$((failed + 1)); \
|
failed=$$((failed + 1)); \
|
||||||
fi; \
|
fi; \
|
||||||
done; \
|
done; \
|
||||||
if [ "$$failed" != 0 ]; then \
|
if [ "$$failed" != 0 ]; then \
|
||||||
echo "$$failed out of $$total tests failed "; \
|
echo "$${red}$$failed out of $$total tests failed $$normal"; \
|
||||||
exit 1; \
|
exit 1; \
|
||||||
|
else \
|
||||||
|
echo "$${green}All tests succeeded"; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
.PHONY: check installcheck
|
.PHONY: check installcheck
|
||||||
|
|
Loading…
Reference in a new issue