summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2021-03-16 07:15:01 -0700
committerKaz Kylheku <kaz@kylheku.com>2021-03-16 07:15:01 -0700
commit8db35fab850581a46e26a07185386c63c9bc6df5 (patch)
tree0aaf089d004ecdc2e825859daa00dd87d1a03770 /Makefile
parent9cafad653dbb6b09c6ee283fb105d000e0c8c0c2 (diff)
downloadtxr-8db35fab850581a46e26a07185386c63c9bc6df5.tar.gz
txr-8db35fab850581a46e26a07185386c63c9bc6df5.tar.bz2
txr-8db35fab850581a46e26a07185386c63c9bc6df5.zip
tests: fix retest logic for parallel operation.
I'm giving up and just using a recursive make invocation for the "retest" target. * Makefile (retest): Depend on nothing. Remove the tst directory and invoke make tests recursively. (tests.clean): Target removed.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 5 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 2b234e53..f0426802 100644
--- a/Makefile
+++ b/Makefile
@@ -372,6 +372,11 @@ TESTS_OK := $(addprefix tst/,\
tests: $(TESTS_OK)
$(V)echo "** tests passed!"
+.PHONY: retest
+retest:
+ $(V)rm -rf tst
+ $(V)$(MAKE) tests
+
tst/tests/000/binding.ok: TXR_OPTS := -B
tst/tests/001/%: TXR_ARGS := tests/001/data
tst/tests/001/query-1.ok: TXR_OPTS := -B
@@ -442,13 +447,6 @@ tst/%.ok: %.tl %.expected $(TXR)
fi)
$(call SH,touch $@)
-.PHONY: tests.clean
-tests.clean: | tests
- rm -rf tst
-
-.PHONY: retest
-retest: | tests.clean tests
-
define GREP_CHECK
$(V)if [ $$(grep -E $(1) $(SRCS) | wc -l) -ne $(3) ] ; then \
echo "New '$(2)' occurrences have been found:" ; \