From 7898cdb75a721cc21867ccdbcc523e95f2db0354 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 8 May 2020 11:49:40 +0200
Subject: [PATCH] make check: Run unit tests

---
 mk/programs.mk             | 6 ++++++
 mk/tracing.mk              | 1 +
 nix-rust/local.mk          | 2 +-
 src/libutil/tests/local.mk | 2 ++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/mk/programs.mk b/mk/programs.mk
index d93df4468..2d0c988d4 100644
--- a/mk/programs.mk
+++ b/mk/programs.mk
@@ -76,4 +76,10 @@ define build-program
   programs-list += $$($(1)_PATH)
   clean-files += $$($(1)_PATH) $$(_d)/*.o $$(_d)/.*.dep $$($(1)_DEPS) $$($(1)_OBJS)
   dist-files += $$(_srcs)
+
+  # Phony target to run this program (typically as a dependency of 'check').
+  .PHONY: $(1)_RUN
+  $(1)_RUN: $$($(1)_PATH)
+	$(trace-test) $$($(1)_PATH)
+
 endef
diff --git a/mk/tracing.mk b/mk/tracing.mk
index 13912d3c7..54c77ab60 100644
--- a/mk/tracing.mk
+++ b/mk/tracing.mk
@@ -11,6 +11,7 @@ ifeq ($(V), 0)
   trace-javac   = @echo "  JAVAC " $@;
   trace-jar     = @echo "  JAR   " $@;
   trace-mkdir   = @echo "  MKDIR " $@;
+  trace-test    = @echo "  TEST  " $@;
 
   suppress  = @
 
diff --git a/nix-rust/local.mk b/nix-rust/local.mk
index 1e006e500..e4bfde31b 100644
--- a/nix-rust/local.mk
+++ b/nix-rust/local.mk
@@ -41,5 +41,5 @@ ifneq ($(OS), Darwin)
 check: rust-tests
 
 rust-tests:
-	cd nix-rust && CARGO_HOME=$$(if [[ -d vendor ]]; then echo vendor; fi) cargo test --release $$(if [[ -d vendor ]]; then echo --offline; fi)
+	$(trace-test) cd nix-rust && CARGO_HOME=$$(if [[ -d vendor ]]; then echo vendor; fi) cargo test --release $$(if [[ -d vendor ]]; then echo --offline; fi)
 endif
diff --git a/src/libutil/tests/local.mk b/src/libutil/tests/local.mk
index 9c2d2a7bb..a188d5093 100644
--- a/src/libutil/tests/local.mk
+++ b/src/libutil/tests/local.mk
@@ -1,3 +1,5 @@
+check: libutil-tests_RUN
+
 programs += libutil-tests
 
 libutil-tests_DIR := $(d)