test suite: editing a test script overrides DGIT_TESTS_PROGRESSIVE.

[dgit.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index e6ce153bae615795e3dacc51ceafd1b324ab1353..88bc0a061c7216655ced9ac8996fa13a486bdba5 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -7,19 +7,12 @@ TESTSCRIPTS ?= $(shell tests/enumerate-tests)
 TESTNAMES := $(notdir $(TESTSCRIPTS))
 
 all: $(foreach t,$(TESTNAMES),tests/tmp/$t.ok)
-       @echo "ALL PASSED"
-
-tests/tmp:
-       mkdir -p $@
+       @echo "ALL PASSED$${DGIT_TESTS_PROGRESSIVE+ AT SOME POINT}"
 
+tests/tmp/%.ok: tests/tests/%
 ifeq ($(DGIT_TEST_RETRY_COUNT),)
-
-tests/tmp/%.ok: tests/tmp
        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 +20,5 @@ tests/tmp/%.ok: tests/tmp
                if [ $$rc = 0 ]; then exit 0; fi;                       \
                echo >&2 "[$$retry] $* TEST FAILED $$rc";               \
        done; exit $$rc
-
 endif
+       @touch $@