From 8db35fab850581a46e26a07185386c63c9bc6df5 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Tue, 16 Mar 2021 07:15:01 -0700 Subject: 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. --- Makefile | 12 +++++------- 1 file 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:" ; \ -- cgit v1.2.3