test suite: run-all: Minor refactoring etc.

[dgit.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index e6ce153bae615795e3dacc51ceafd1b324ab1353..44b745849153b22b13041666efa5a4aec168ea2a 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -12,14 +12,11 @@ all: $(foreach t,$(TESTNAMES),tests/tmp/$t.ok)
 tests/tmp:
        mkdir -p $@
 
-ifeq ($(DGIT_TEST_RETRY_COUNT),)
 
 tests/tmp/%.ok: tests/tmp
+ifeq ($(DGIT_TEST_RETRY_COUNT),)
        tests/tests/$* >tests/tmp/$*.log 2>&1
-
 else
-
-tests/tmp/%.ok: tests/tmp
        @for retry in $$( seq 1 $(DGIT_TEST_RETRY_COUNT) ); do          \
                echo "[$$retry] $*";                                    \
                tests/tests/$* >tests/tmp/$*.$$retry.log 2>&1;          \
@@ -27,5 +24,4 @@ tests/tmp/%.ok: tests/tmp
                if [ $$rc = 0 ]; then exit 0; fi;                       \
                echo >&2 "[$$retry] $* TEST FAILED $$rc";               \
        done; exit $$rc
-
 endif