From 038579b8fd9b96a207cb45e0adf113e881d8ff8d Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Wed, 16 Dec 2020 15:27:44 -0500 Subject: Makefile: Clean up check dependencies a bit --- Makefile | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 9a73451..cdbf664 100644 --- a/Makefile +++ b/Makefile @@ -124,6 +124,13 @@ ifndef GOALS FLAG_PREREQS += default endif +# The different search strategies that we test +STRATEGIES := bfs dfs ids eds +STRATEGY_CHECKS := $(STRATEGIES:%=check-%) + +# All the different checks we run +CHECKS := $(STRATEGY_CHECKS) check-trie check-xtimegm + default: bfs all: $(BIN_GOALS) @@ -166,17 +173,14 @@ $(BIN_GOALS): $(FLAG_GOALS): $(FLAG_PREREQS) @: -check: check-trie check-xtimegm check-bfs check-dfs check-ids check-eds +check: $(CHECKS) -check-trie: tests/trie - $< +$(STRATEGY_CHECKS): check-%: bfs tests/mksock + ./tests.sh --bfs="$(CURDIR)/bfs -S $*" $(TEST_FLAGS) -check-xtimegm: tests/xtimegm +check-trie check-xtimegm: check-%: tests/% $< -check-%: all - ./tests.sh --bfs="$(CURDIR)/bfs -S $*" $(TEST_FLAGS) - distcheck: +$(MAKE) -B asan ubsan check $(DISTCHECK_FLAGS) ifneq ($(OS),Darwin) @@ -201,6 +205,6 @@ uninstall: $(RM) $(DESTDIR)$(PREFIX)/bin/bfs $(RM) $(DESTDIR)$(MANDIR)/man1/bfs.1 -.PHONY: default all $(FLAG_GOALS) check check-trie check-xtimegm distcheck clean install uninstall +.PHONY: default all $(FLAG_GOALS) check $(CHECKS) distcheck clean install uninstall -include $(wildcard *.d) -- cgit v1.2.3