[src/trunk]: src/usr.bin/make/unit-tests tests/make: use more distinctive pla...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fa38ea0b585f
branches:  trunk
changeset: 361101:fa38ea0b585f
user:      rillig <rillig%NetBSD.org@localhost>
date:      Wed Feb 09 18:54:19 2022 +0000

description:
tests/make: use more distinctive placeholder for TMPDIR

diffstat:

 usr.bin/make/unit-tests/Makefile            |  4 ++--
 usr.bin/make/unit-tests/cmdline.exp         |  4 ++--
 usr.bin/make/unit-tests/export.exp          |  2 +-
 usr.bin/make/unit-tests/objdir-writable.exp |  8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diffs (52 lines):

diff -r d35f12b55d27 -r fa38ea0b585f usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Wed Feb 09 18:09:48 2022 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Wed Feb 09 18:54:19 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.303 2022/02/07 22:43:50 rillig Exp $
+# $NetBSD: Makefile,v 1.304 2022/02/09 18:54:19 rillig Exp $
 #
 # Unit tests for make(1)
 #
@@ -695,7 +695,7 @@
 # Allow the test files to be placed anywhere.
 _SED_CMDS+=    -e 's,\(\.PARSEDIR}\) = `'"/[^']*'"',\1 = <some-dir>,'
 _SED_CMDS+=    -e 's,\(\.INCLUDEDFROMDIR}\) = `'"/[^']*'"',\1 = <some-dir>,'
-_SED_CMDS+=    -e 's,${TMPDIR},TMPDIR,g'
+_SED_CMDS+=    -e 's,${TMPDIR},<tmpdir>,g'
 # canonicalize ${.OBJDIR} and ${.CURDIR}
 .if ${.OBJDIR} != ${.CURDIR}
 # yes this is inaccurate but none of the tests expect <objdir> anywhere
diff -r d35f12b55d27 -r fa38ea0b585f usr.bin/make/unit-tests/cmdline.exp
--- a/usr.bin/make/unit-tests/cmdline.exp       Wed Feb 09 18:09:48 2022 +0000
+++ b/usr.bin/make/unit-tests/cmdline.exp       Wed Feb 09 18:54:19 2022 +0000
@@ -1,5 +1,5 @@
 makeobjdir-direct:
-show-objdir: TMPDIR/6a8899d2-d227-4b55-9b6b-f3c8eeb83fd5
+show-objdir: <tmpdir>/6a8899d2-d227-4b55-9b6b-f3c8eeb83fd5
 makeobjdir-indirect:
-show-objdir: TMPDIR/a7b41170-53f8-4cc2-bc5c-e4c3dd93ec45/
+show-objdir: <tmpdir>/a7b41170-53f8-4cc2-bc5c-e4c3dd93ec45/
 exit status 0
diff -r d35f12b55d27 -r fa38ea0b585f usr.bin/make/unit-tests/export.exp
--- a/usr.bin/make/unit-tests/export.exp        Wed Feb 09 18:09:48 2022 +0000
+++ b/usr.bin/make/unit-tests/export.exp        Wed Feb 09 18:54:19 2022 +0000
@@ -1,5 +1,5 @@
 MAKELEVEL=1
-TMPDIR=TMPDIR
+TMPDIR=<tmpdir>
 UT_DOLLAR=This is $UT_FU
 UT_FOO=foobar is fubar
 UT_FU=fubar
diff -r d35f12b55d27 -r fa38ea0b585f usr.bin/make/unit-tests/objdir-writable.exp
--- a/usr.bin/make/unit-tests/objdir-writable.exp       Wed Feb 09 18:09:48 2022 +0000
+++ b/usr.bin/make/unit-tests/objdir-writable.exp       Wed Feb 09 18:54:19 2022 +0000
@@ -1,5 +1,5 @@
-make warning: TMPDIR/roobj: Permission denied.
-TMPDIR
-TMPDIR/roobj
-TMPDIR/roobj
+make warning: <tmpdir>/roobj: Permission denied.
+<tmpdir>
+<tmpdir>/roobj
+<tmpdir>/roobj
 exit status 0