summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Buehler <tb@cvs.openbsd.org>2022-12-09 09:30:55 +0000
committerTheo Buehler <tb@cvs.openbsd.org>2022-12-09 09:30:55 +0000
commit712510118ae4253f819758c0cf6581d046040655 (patch)
tree2677d04f4cb8d47ec2621fc1ece0ebcb75702a60
parenta4178112b438e1e0f3d699c37f5f1b32818bc45d (diff)
Allow overriding default run-regress-* targets
Overriding a default run-regress-* target with custom commands is already possible and done by many tests. The fact that it currently works depends on behavior in the BUGs section of make.1, however. The fix is not to add commands if the target is already defined with commands. tested by anton correct fix from espie, ok anton
-rw-r--r--share/mk/bsd.regress.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/share/mk/bsd.regress.mk b/share/mk/bsd.regress.mk
index 8cdeef55208..6f14dd1a386 100644
--- a/share/mk/bsd.regress.mk
+++ b/share/mk/bsd.regress.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.regress.mk,v 1.24 2021/08/31 23:33:05 bluhm Exp $
+# $OpenBSD: bsd.regress.mk,v 1.25 2022/12/09 09:30:54 tb Exp $
# Documented in bsd.regress.mk(5)
# No man pages for regression tests.
@@ -33,7 +33,9 @@ _REGRESS_OUT= | tee -a ${REGRESS_LOG} ${_REGRESS_TMP} 2>&1 > /dev/null
.for p in ${PROG} ${PROGS}
run-regress-$p: $p
+. if !commands(run-regress-$p)
./$p
+. endif
.PHONY: run-regress-$p
.endfor