X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2FMakefile;h=31eb7b62456e91692ac7c1e4b99eefb87026a1ba;hp=e6ce153bae615795e3dacc51ceafd1b324ab1353;hb=7bcf96858056c7c5c64c451833688cf495647d56;hpb=88c8440dc1ac4e6de35615ac18fdb3ec281e1d96 diff --git a/tests/Makefile b/tests/Makefile index e6ce153b..31eb7b62 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -7,25 +7,18 @@ 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 - + $(DGIT_TEST_RUN_PFX) 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; \ + $(DGIT_TEST_RUN_PFX) tests/tests/$* >tests/tmp/$*.$$retry.log 2>&1; \ rc=$$?; \ if [ $$rc = 0 ]; then exit 0; fi; \ echo >&2 "[$$retry] $* TEST FAILED $$rc"; \ done; exit $$rc - endif + @touch $@