Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/make: use more distinctive placeholder for TMPDIR

This commit is contained in:
rillig 2022-02-09 18:54:19 +00:00
parent b622e32a93
commit 05a9897bf8
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/make/unit-tests/Makefile
View File

@ -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-tests,'
# 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

4
usr.bin/make/unit-tests/cmdline.exp
View File

@ -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

2
usr.bin/make/unit-tests/export.exp
View File

@ -1,5 +1,5 @@
MAKELEVEL=1
TMPDIR=TMPDIR
TMPDIR=<tmpdir>
UT_DOLLAR=This is $UT_FU
UT_FOO=foobar is fubar
UT_FU=fubar

8
usr.bin/make/unit-tests/objdir-writable.exp
View File

@ -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