From e0d67aeb886c75dde8f05120a2d8d1bd2dd2c16c Mon Sep 17 00:00:00 2001
From: "Luke T. Shumaker" <lukeshu@lukeshu.com>
Date: Sat, 12 Apr 2025 06:18:58 -0600
Subject: GNUmakefile: Fix ctest jobserver integration

---
 GNUmakefile | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 0955a6a..4183e37 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -78,9 +78,6 @@ generate-clean:
 platforms := rp2040 host # $(shell sed -nE 's/if *\(PICO_PLATFORM STREQUAL "(.*)"\)/\1/p' cmd/*/CMakeLists.txt)
 build_types = Debug Release RelWithDebInfo MinSizeRel
 
-export CTEST_PARALLEL_LEVEL = 0
-export CTEST_OUTPUT_ON_FAILURE = 1
-
 build: $(foreach t,$(build_types),$(foreach p,$(platforms),build/$p-$t/build))
 .PHONY: build
 
@@ -91,12 +88,12 @@ $(foreach t,$(build_types),$(foreach p,$(platforms),build/$p-$t/build)): build/%
 	$(MAKE) -C $(<D)
 .PHONY: $(foreach t,$(build_types),$(foreach p,$(platforms),build/$p-$t/build))
 
-check: build
-	$(MAKE) -j1 -k INNER=t $(foreach t,$(build_types),$(foreach p,$(platforms),build/$p-$t/check))
+check:
+	$(MAKE) -k INNER=t $(foreach t,$(build_types),$(foreach p,$(platforms),build/$p-$t/check))
 .PHONY: check
 
-$(foreach t,$(build_types),$(foreach p,$(platforms),build/$p-$t/check)): build/%/check: build/%/Makefile
-	$(MAKE) -C $(<D) test
+$(foreach t,$(build_types),$(foreach p,$(platforms),build/$p-$t/check)): build/%/check: build/%/build
+	+cd $(@D) && ctest --output-on-failure $(if $(filter --jobserver-auth=%,$(MAKEFLAGS)),--parallel)
 .PHONY: $(foreach t,$(build_types),$(foreach p,$(platforms),build/$p-$t/check))
 
 # `lint` and `format` ##########################################################
-- 
cgit v1.2.3-2-g168b