chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i18n: dgit: Reorganise quilt differences message generation
[dgit.git]
/
tests
/
Makefile
diff --git
a/tests/Makefile
b/tests/Makefile
index 44b745849153b22b13041666efa5a4aec168ea2a..31eb7b62456e91692ac7c1e4b99eefb87026a1ba 100644
(file)
--- a/
tests/Makefile
+++ b/
tests/Makefile
@@
-7,21
+7,18
@@
TESTSCRIPTS ?= $(shell tests/enumerate-tests)
TESTNAMES := $(notdir $(TESTSCRIPTS))
all: $(foreach t,$(TESTNAMES),tests/tmp/$t.ok)
TESTNAMES := $(notdir $(TESTSCRIPTS))
all: $(foreach t,$(TESTNAMES),tests/tmp/$t.ok)
- @echo "ALL PASSED"
+ @echo "ALL PASSED
$${DGIT_TESTS_PROGRESSIVE+ AT SOME POINT}
"
-tests/tmp:
- mkdir -p $@
-
-
-tests/tmp/%.ok: tests/tmp
+tests/tmp/%.ok: tests/tests/%
ifeq ($(DGIT_TEST_RETRY_COUNT),)
ifeq ($(DGIT_TEST_RETRY_COUNT),)
- tests/tests/$* >tests/tmp/$*.log 2>&1
+
$(DGIT_TEST_RUN_PFX)
tests/tests/$* >tests/tmp/$*.log 2>&1
else
@for retry in $$( seq 1 $(DGIT_TEST_RETRY_COUNT) ); do \
echo "[$$retry] $*"; \
else
@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
rc=$$?; \
if [ $$rc = 0 ]; then exit 0; fi; \
echo >&2 "[$$retry] $* TEST FAILED $$rc"; \
done; exit $$rc
endif
+ @touch $@