about summary refs log tree commit diff
path: root/mk
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-11-07T11·06+0100
committerEelco Dolstra <edolstra@gmail.com>2017-11-07T11·09+0100
commitfd10f6f2414521947ca60b9d1508d909f50e9faa (patch)
tree6a2c1608f9529a340e720b8352e93cba46c7f365 /mk
parentdc30856141a1ef3958dfe230611d9447d7a13957 (diff)
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.
Diffstat (limited to 'mk')
-rw-r--r--mk/tests.mk16
1 files changed, 9 insertions, 7 deletions
diff --git a/mk/tests.mk b/mk/tests.mk
index 1138857c3c16..e353d46a0d02 100644
--- a/mk/tests.mk
+++ b/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=""; \
+		green=""; \
+		yellow=""; \
+		normal=""; \
 	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/^/    /'; \