forked from lix-project/lix
Show when tests are skipped
Also, don't depend on tput (ncurses). It's really not needed since ANSI escape sequences have been standardized for 35 years or so.
This commit is contained in:
parent
dc30856141
commit
fd10f6f241
16
mk/tests.mk
16
mk/tests.mk
|
@ -12,21 +12,23 @@ installcheck:
|
|||
@total=0; failed=0; \
|
||||
red=""; \
|
||||
green=""; \
|
||||
yellow=""; \
|
||||
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; \
|
||||
red="[31;1m"; \
|
||||
green="[32;1m"; \
|
||||
yellow="[33;1m"; \
|
||||
normal="[m"; \
|
||||
fi; \
|
||||
for i in $(_installcheck-list); do \
|
||||
total=$$((total + 1)); \
|
||||
printf "running test $$i..."; \
|
||||
log="$$(cd $$(dirname $$i) && $(tests-environment) $$(basename $$i) 2>&1)"; \
|
||||
if [ $$? -eq 0 ]; then \
|
||||
status=$$?; \
|
||||
if [ $$status -eq 0 ]; then \
|
||||
echo " [$${green}PASS$$normal]"; \
|
||||
elif [ $$status -eq 99 ]; then \
|
||||
echo " [$${yellow}SKIP$$normal]"; \
|
||||
else \
|
||||
echo " [$${red}FAIL$$normal]"; \
|
||||
echo "$$log" | sed 's/^/ /'; \
|
||||
|
|
|
@ -2,7 +2,7 @@ source common.sh
|
|||
|
||||
if [[ -z $(type -p git) ]]; then
|
||||
echo "Git not installed; skipping Git tests"
|
||||
exit 0
|
||||
exit 99
|
||||
fi
|
||||
|
||||
clearStore
|
||||
|
|
|
@ -2,7 +2,7 @@ source common.sh
|
|||
|
||||
if [[ -z $(type -p hg) ]]; then
|
||||
echo "Mercurial not installed; skipping Mercurial tests"
|
||||
exit 0
|
||||
exit 99
|
||||
fi
|
||||
|
||||
clearStore
|
||||
|
|
Loading…
Reference in a new issue