Module Name: src
Committed By: rillig
Date: Wed Feb 9 18:54:19 UTC 2022
Modified Files:
src/usr.bin/make/unit-tests: Makefile cmdline.exp export.exp
objdir-writable.exp
Log Message:
tests/make: use more distinctive placeholder for TMPDIR
To generate a diff of this commit:
cvs rdiff -u -r1.303 -r1.304 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/cmdline.exp
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/export.exp
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/objdir-writable.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.303 src/usr.bin/make/unit-tests/Makefile:1.304
--- src/usr.bin/make/unit-tests/Makefile:1.303 Mon Feb 7 22:43:50 2022
+++ src/usr.bin/make/unit-tests/Makefile Wed Feb 9 18:54:19 2022
@@ -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 @@ _SED_CMDS+= -e '/stopped/s, /.*, unit-te
# 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
Index: src/usr.bin/make/unit-tests/cmdline.exp
diff -u src/usr.bin/make/unit-tests/cmdline.exp:1.2 src/usr.bin/make/unit-tests/cmdline.exp:1.3
--- src/usr.bin/make/unit-tests/cmdline.exp:1.2 Sat Feb 6 18:26:03 2021
+++ src/usr.bin/make/unit-tests/cmdline.exp Wed Feb 9 18:54:19 2022
@@ -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
Index: src/usr.bin/make/unit-tests/export.exp
diff -u src/usr.bin/make/unit-tests/export.exp:1.6 src/usr.bin/make/unit-tests/export.exp:1.7
--- src/usr.bin/make/unit-tests/export.exp:1.6 Sat Feb 6 18:26:03 2021
+++ src/usr.bin/make/unit-tests/export.exp Wed Feb 9 18:54:19 2022
@@ -1,5 +1,5 @@
MAKELEVEL=1
-TMPDIR=TMPDIR
+TMPDIR=<tmpdir>
UT_DOLLAR=This is $UT_FU
UT_FOO=foobar is fubar
UT_FU=fubar
Index: src/usr.bin/make/unit-tests/objdir-writable.exp
diff -u src/usr.bin/make/unit-tests/objdir-writable.exp:1.3 src/usr.bin/make/unit-tests/objdir-writable.exp:1.4
--- src/usr.bin/make/unit-tests/objdir-writable.exp:1.3 Sun Jul 4 01:28:54 2021
+++ src/usr.bin/make/unit-tests/objdir-writable.exp Wed Feb 9 18:54:19 2022
@@ -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
