[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openbsd-tech
Subject:    regress progs
From:       Alexander Bluhm <alexander.bluhm () gmx ! net>
Date:       2021-08-31 16:57:18
Message-ID: YS5fbixo2d9+5Pu8 () t430s ! bluhm ! invalid
[Download RAW message or body]

Hi,

bsd.prog.mk supports PROGS (with an S) for a while.  I think we
should have multiple programs in bsd.regress.mk, too.  Mainly for
consistency, but a few tests could be simplified with this.

ok?

bluhm

Index: bsd.regress.mk
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/share/mk/bsd.regress.mk,v
retrieving revision 1.23
diff -u -p -r1.23 bsd.regress.mk
--- bsd.regress.mk	17 Dec 2020 14:54:15 -0000	1.23
+++ bsd.regress.mk	30 Aug 2021 20:42:35 -0000
@@ -8,7 +8,7 @@ NOMAN=
 install:
 
 # If REGRESS_TARGETS is defined and PROG is not defined, set NOPROG
-.if defined(REGRESS_TARGETS) && !defined(PROG)
+.if defined(REGRESS_TARGETS) && !defined(PROG) && !defined(PROGS)
 NOPROG=
 .endif
 
@@ -31,16 +31,16 @@ _REGRESS_NAME=${.CURDIR:S/${BSDSRCDIR}\/
 _REGRESS_TMP?=/dev/null
 _REGRESS_OUT= | tee -a ${REGRESS_LOG} ${_REGRESS_TMP} 2>&1 > /dev/null
 
-.if defined(PROG) && !empty(PROG)
-run-regress-${PROG}: ${PROG}
-	./${PROG}
-.PHONY: run-regress-${PROG}
-.endif
+.for p in ${PROG} ${PROGS}
+run-regress-$p: $p
+	./$p
+.PHONY: run-regress-$p
+.endfor
 
-.if defined(PROG) && !defined(REGRESS_TARGETS)
-REGRESS_TARGETS=run-regress-${PROG}
+.if (defined(PROG) || defined(PROGS)) && !defined(REGRESS_TARGETS)
+REGRESS_TARGETS=	${PROG:S/^/run-regress-/} ${PROGS:S/^/run-regress-/}
 .  if defined(REGRESS_SKIP)
-REGRESS_SKIP_TARGETS=run-regress-${PROG}
+REGRESS_SKIP_TARGETS=	${PROG:S/^/run-regress-/} ${PROGS:S/^/run-regress-/}
 .  endif
 .endif
 

[prev in list] [next in list] [prev in thread] [next in thread]