Module Name: src
Committed By: sjg
Date: Tue Apr 30 16:41:33 UTC 2024
Modified Files:
src/usr.bin/make/unit-tests: Makefile deptgt-phony.exp
Log Message:
Subst DEFSYSPATH in deptgt-phony
To generate a diff of this commit:
cvs rdiff -u -r1.343 -r1.344 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/deptgt-phony.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.343 src/usr.bin/make/unit-tests/Makefile:1.344
--- src/usr.bin/make/unit-tests/Makefile:1.343 Sat Apr 20 10:18:55 2024
+++ src/usr.bin/make/unit-tests/Makefile Tue Apr 30 16:41:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.343 2024/04/20 10:18:55 rillig Exp $
+# $NetBSD: Makefile,v 1.344 2024/04/30 16:41:32 sjg Exp $
#
# Unit tests for make(1)
#
@@ -589,8 +589,9 @@ unexport-env.rawout: export.mk
# In tests that use the debugging option -dd, ignore debugging output that is
# only logged in -DCLEANUP mode.
-STD_SED_CMDS.dd= -e '/^OpenDirs_Done:/d'
-STD_SED_CMDS.dd+= -e '/^CachedDir /d'
+STD_SED_CMDS.dd= -e '/^OpenDirs_Done:/d'
+STD_SED_CMDS.dd+= -e '/^CachedDir /d'
+STD_SED_CMDS.dd+= -e 's, ${DEFSYSPATH:U/usr/share/mk} , <defsyspath> ,'
# Omit details such as process IDs from the output of the -dg1 option.
STD_SED_CMDS.dg1= -e 's,${.CURDIR}$$,<curdir>,'
Index: src/usr.bin/make/unit-tests/deptgt-phony.exp
diff -u src/usr.bin/make/unit-tests/deptgt-phony.exp:1.3 src/usr.bin/make/unit-tests/deptgt-phony.exp:1.4
--- src/usr.bin/make/unit-tests/deptgt-phony.exp:1.3 Tue Apr 30 16:13:34 2024
+++ src/usr.bin/make/unit-tests/deptgt-phony.exp Tue Apr 30 16:41:32 2024
@@ -3,7 +3,7 @@ Expanding "deptgt-phony-pr-15164-*-wildc
Searching for .depend ...
failed.
Searching for .depend ...[dot last]...
- /usr/share/mk ...
+ <defsyspath> ...
failed.
Wildcard expanding "all"...
Searching for all ...
