From 3ca40aab63590c51ed84101105e72153dfe25327 Mon Sep 17 00:00:00 2001 From: espie Date: Mon, 23 Oct 2023 08:38:58 +0000 Subject: [PATCH] use more natural (and new) += with REGRESSION_TESTING --- regress/usr.sbin/pkg_add/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/regress/usr.sbin/pkg_add/Makefile b/regress/usr.sbin/pkg_add/Makefile index 84462872909..a4c4e36353d 100644 --- a/regress/usr.sbin/pkg_add/Makefile +++ b/regress/usr.sbin/pkg_add/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.88 2023/10/11 13:54:43 espie Exp $ +# $OpenBSD: Makefile,v 1.89 2023/10/23 08:38:58 espie Exp $ REGRESS_TARGETS=pkgnames pkgpaths signatures depends-check longnames pkgcfl \ collision-check1 collision-check2 collision-check3 \ @@ -24,9 +24,8 @@ REGRESS_EXPECTED_FAILURES = collision-check1 collision-check2 \ PERLSCRIPT = perl -I ${.CURDIR} ${.CURDIR} -WAVE_PLIST=-DREGRESSION_TESTING=plist_checks -STUB=-DREGRESSION_TESTING=stub -WAVE_PLIST_STUB=-DREGRESSION_TESTING=plist_checks,stub +WAVE_PLIST=-DREGRESSION_TESTING+=plist_checks +STUB=-DREGRESSION_TESTING+=stub ADD_PKG = ${PERLSCRIPT}/my add -Dchecksum DELETE_PKG = ${PERLSCRIPT}/my delete -Dchecksum @@ -593,14 +592,14 @@ rep1/ol-1.tgz: plist21 CUPS_FILES += rep2/$o.tgz rep2/$o.tgz: ${.CURDIR}/oldcups/$o/+CONTENTS mkdir -p rep2 - cd rep2 && pkg_create ${WAVE_PLIST_STUB} -f ${.CURDIR}/oldcups/$o/+CONTENTS + cd rep2 && pkg_create ${WAVE_PLIST} ${STUB} -f ${.CURDIR}/oldcups/$o/+CONTENTS .endfor .for n in cups-2.2.8 cups-filters-1.20.3 cups-libs-2.2.8 ghostscript-9.07p7 CUPS_FILES += rep3/$n.tgz rep3/$n.tgz: ${.CURDIR}/newcups/$n/+CONTENTS mkdir -p rep3 - cd rep3 && pkg_create ${WAVE_PLIST_STUB} -f ${.CURDIR}/newcups/$n/+CONTENTS + cd rep3 && pkg_create ${WAVE_PLIST} ${STUB} -f ${.CURDIR}/newcups/$n/+CONTENTS .endfor cups-bug: ${CUPS_FILES} -- 2.20.1