From 97deb00cbc5697d86a04ec7491b5b0da26ee5357 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 15 May 2023 18:13:11 -0400
Subject: [PATCH] Create notion of "test group", use for local overlay store

---
 mk/lib.mk      |  9 +++++++++
 mk/tests.mk    |  5 +----
 tests/local.mk | 10 +++++++---
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/mk/lib.mk b/mk/lib.mk
index 34fa624d8..a6c2b32e4 100644
--- a/mk/lib.mk
+++ b/mk/lib.mk
@@ -10,6 +10,7 @@ bin-scripts :=
 noinst-scripts :=
 man-pages :=
 install-tests :=
+install-tests-groups :=
 
 ifdef HOST_OS
   HOST_KERNEL = $(firstword $(subst -, ,$(HOST_OS)))
@@ -122,6 +123,14 @@ $(foreach script, $(bin-scripts), $(eval programs-list += $(script)))
 $(foreach script, $(noinst-scripts), $(eval programs-list += $(script)))
 $(foreach template, $(template-files), $(eval $(call instantiate-template,$(template))))
 $(foreach test, $(install-tests), $(eval $(call run-install-test,$(test))))
+$(foreach test, $(install-tests), $(eval installcheck: $(test).test))
+$(foreach test-group, $(install-tests-groups), \
+  $(eval installcheck: $(test-group).test-group) \
+  $(eval .PHONY: $(test-group).test-group) \
+  $(foreach test, $($(test-group)-tests), \
+    $(eval $(call run-install-test,$(test))) \
+    $(eval $(test-group).test-group: $(test).test)))
+
 $(foreach file, $(man-pages), $(eval $(call install-data-in, $(file), $(mandir)/man$(patsubst .%,%,$(suffix $(file))))))
 
 
diff --git a/mk/tests.mk b/mk/tests.mk
index 3ebbd86e3..dca3c5da2 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -2,10 +2,7 @@
 
 test-deps =
 
-define run-install-test
-
-  installcheck: $1.test
-
+define run-install-test $1
   .PHONY: $1.test
   $1.test: $1 $(test-deps)
 	@env BASH=$(bash) $(bash) mk/run-test.sh $1 < /dev/null
diff --git a/tests/local.mk b/tests/local.mk
index 778d087b1..2dea58e7b 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -135,9 +135,13 @@ nix_tests = \
   flakes/show.sh \
   impure-derivations.sh \
   path-from-hash-part.sh \
-  toString-path.sh \
-  overlay-local-store/outer.sh \
-  overlay-local-store/bad-uris.sh
+  toString-path.sh
+
+overlay-local-store-tests := \
+  $(d)/overlay-local-store/outer.sh \
+  $(d)/overlay-local-store/bad-uris.sh
+
+install-tests-groups += overlay-local-store
 
 ifeq ($(HAVE_LIBCPUID), 1)
 	nix_tests += compute-levels.sh