From d2182ad7d1c009874063722e34f153b516bbd5cb Mon Sep 17 00:00:00 2001
From: tv <tv@nomic.retiolum>
Date: Thu, 27 Feb 2014 01:19:39 +0100
Subject: util make test: touch .test-not-ok on error
---
util/Makefile | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
(limited to 'util')
diff --git a/util/Makefile b/util/Makefile
index 3c20f550..375199e4 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -4,22 +4,21 @@ test:
@export PATH="$(CURDIR)/bin:$(PATH)"; \
tests="`find t -type f -executable`"; \
i=1; \
- pids="";\
n=`echo "$$tests" | wc -l`; \
echo $$i..$$n; \
for exe in $$tests; do \
{ \
./$$exe; \
- ret=$$?; \
- case $$ret in 0) result=ok;; *) result='not ok';; esac; \
+ case $$? in \
+ 0) result=ok;; \
+ *) result='not ok'; touch .test-not-ok;; \
+ esac; \
echo $$result $$i - $$exe; \
- exit $$ret;\
} & \
- pids="$${pids} $$!" \
i=$$(( i+1 )); \
done; \
- ret=0;\
- for pid in $$pids; do \
- wait $$pid || ret=23;\
- done; \
- exit $$ret;
+ wait; \
+ if test -e .test-not-ok; then \
+ rm .test-not-ok; \
+ exit 23; \
+ fi
--
cgit v1.2.3
From 433bc6bdcb62fa5e3cf2d0ba81bf3ceaa53b55e9 Mon Sep 17 00:00:00 2001
From: tv <tv@nomic.retiolum>
Date: Thu, 27 Feb 2014 01:25:49 +0100
Subject: util make test: rephrase
---
util/Makefile | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
(limited to 'util')
diff --git a/util/Makefile b/util/Makefile
index 375199e4..5096506b 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -7,14 +7,12 @@ test:
n=`echo "$$tests" | wc -l`; \
echo $$i..$$n; \
for exe in $$tests; do \
- { \
- ./$$exe; \
- case $$? in \
- 0) result=ok;; \
- *) result='not ok'; touch .test-not-ok;; \
- esac; \
- echo $$result $$i - $$exe; \
- } & \
+ if ./$$exe; then \
+ echo ok $$i - $$exe; \
+ else \
+ echo not ok $$i - $$exe; \
+ touch .test-not-ok; \
+ fi & \
i=$$(( i+1 )); \
done; \
wait; \
--
cgit v1.2.3