From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 14 Nov 2019 01:24:39 +0000 (+0000)
Subject: build system: Reorganise check targets
X-Git-Tag: v0.5.1~31
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=77c54ccaf49bebadb197cecf1de3035ee3b30711

build system: Reorganise check targets

Now we don't run msgcode-test unless it's `fullcheck'.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/Subdir.sd.mk b/Subdir.sd.mk
index f9245c2..97b5483 100644
--- a/Subdir.sd.mk
+++ b/Subdir.sd.mk
@@ -82,7 +82,7 @@ STALE_PYTHON_FILES=	$(foreach e, py pyc, \
 %.o: %.c conffile.yy.h
 	$(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
 
-all::	$(TARGETS) check
+all::	$(TARGETS)
 
 ${srcdir}/config.h.in: configure.ac
 	cd ${srcdir} && autoheader
@@ -121,17 +121,15 @@ endif
 
 TESTDIRS=stest mtest
 
-FAST_CHECKS= eax-aes-test.confirm eax-serpent-test.confirm \
+&TARGETS_check = eax-aes-test.confirm eax-serpent-test.confirm \
 	eax-serpentbe-test.confirm check-ipaddrset \
 	$(addsuffix /check,$(TESTDIRS))
 
-CHECKS += $(FAST_CHECKS)
-CHECKS += msgcode-test.confirm
-
-check: $(CHECKS)
+&TARGETS_fullcheck += $(&TARGETS_check)
+&TARGETS_fullcheck += msgcode-test.confirm
 
 recheck:
-	rm -f $(FAST_CHECKS)
+	rm -f $(&TARGETS_CHECK)
 	rm -rf $(addsuffix /d-*, $(TESTDIRS))
 	$(MAKE) check