From aebf99787e71ca035fdae9b15f0089b527492f11 Mon Sep 17 00:00:00 2001 From: sjg Date: Sun, 7 Jan 2024 02:07:44 +0000 Subject: [PATCH] make: unit-tests handle TEST_MAKE:T != make We need to allow for ${TEST_MAKE:T}[1-9]: etc when TEST_MAKE is not 'make' --- usr.bin/make/unit-tests/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.bin/make/unit-tests/Makefile b/usr.bin/make/unit-tests/Makefile index 8362311183ab..a1b92feff2d2 100644 --- a/usr.bin/make/unit-tests/Makefile +++ b/usr.bin/make/unit-tests/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.341 2023/09/09 16:41:04 sjg Exp $ +# $NetBSD: Makefile,v 1.342 2024/01/07 02:07:44 sjg Exp $ # # Unit tests for make(1) # @@ -747,6 +747,7 @@ _SED_CMDS+= -e 's,${.OBJDIR},,g' -e 's,${.OBJDIR:tA},,g' _SED_CMDS+= -e 's,^${TEST_MAKE:T:S,.,\\.,g}[][0-9]*:,make:,' _SED_CMDS+= -e 's,${TEST_MAKE:S,.,\\.,g},make,' _SED_CMDS+= -e 's,^usage: ${TEST_MAKE:T:S,.,\\.,g} ,usage: make ,' +_SED_CMDS+= -e 's,${TEST_MAKE:T:S,.,\\.,g}\(\[[1-9][0-9]*\]:\),make\1,' _SED_CMDS+= -e 's,/,,g' _SED_CMDS+= -e 's,${UNIT_TESTS:S,.,\\.,g}/,,g' _SED_CMDS+= -e '/MAKE_VERSION/d'