summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <root@pigstarter.de>2014-02-27 08:57:29 +0100
committermakefu <root@pigstarter.de>2014-02-27 08:57:29 +0100
commit07ef2abe8188c5337e830f0abf0eec92867df7be (patch)
tree30bae3f3524ccc0d51e30911f8de5c73a40a998c
parent741374c72b8feb470674b2a76a11bd3b1bb17ade (diff)
parent433bc6bdcb62fa5e3cf2d0ba81bf3ceaa53b55e9 (diff)
Merge branch 'master' of https://github.com/krebscode/painload
-rw-r--r--util/Makefile25
1 files changed, 11 insertions, 14 deletions
diff --git a/util/Makefile b/util/Makefile
index 3c20f550..5096506b 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -4,22 +4,19 @@ 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; \
- echo $$result $$i - $$exe; \
- exit $$ret;\
- } & \
- pids="$${pids} $$!" \
+ if ./$$exe; then \
+ echo ok $$i - $$exe; \
+ else \
+ echo not ok $$i - $$exe; \
+ touch .test-not-ok; \
+ fi & \
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