diff options
| author | sjg <sjg@NetBSD.org> | 2021-07-04 01:28:54 +0000 |
|---|---|---|
| committer | sjg <sjg@NetBSD.org> | 2021-07-04 01:28:54 +0000 |
| commit | 18cf45cdb6814d8fd7cccfbdc5f0990eb2d33484 (patch) | |
| tree | cb051fe1b9641b3d10f950abc10b9ae611ba4108 /usr.bin/make | |
| parent | 80eccaeb964d62642b493a14a4601507a0d7b2fe (diff) | |
Do not assume /tmp is safe to use if TMPDIR is set
Diffstat (limited to 'usr.bin/make')
| -rw-r--r-- | usr.bin/make/unit-tests/objdir-writable.exp | 2 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/objdir-writable.mk | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/usr.bin/make/unit-tests/objdir-writable.exp b/usr.bin/make/unit-tests/objdir-writable.exp index 9c507f647f8..e7298a66d36 100644 --- a/usr.bin/make/unit-tests/objdir-writable.exp +++ b/usr.bin/make/unit-tests/objdir-writable.exp @@ -1,5 +1,5 @@ make warning: TMPDIR/roobj: Permission denied. -/tmp +TMPDIR TMPDIR/roobj TMPDIR/roobj exit status 0 diff --git a/usr.bin/make/unit-tests/objdir-writable.mk b/usr.bin/make/unit-tests/objdir-writable.mk index 9fc1c69afb5..b09baa3c32b 100644 --- a/usr.bin/make/unit-tests/objdir-writable.mk +++ b/usr.bin/make/unit-tests/objdir-writable.mk @@ -1,8 +1,9 @@ -# $NetBSD: objdir-writable.mk,v 1.4 2020/11/14 07:36:00 sjg Exp $ +# $NetBSD: objdir-writable.mk,v 1.5 2021/07/04 01:28:54 sjg Exp $ # test checking for writable objdir -RO_OBJDIR?= ${TMPDIR:U/tmp}/roobj +TMPDIR?= /tmp +RO_OBJDIR?= ${TMPDIR}/roobj .if make(do-objdir) # this should succeed @@ -20,12 +21,12 @@ rm-objdir: @rmdir ${RO_OBJDIR} no-objdir: - @MAKEOBJDIR=${RO_OBJDIR} ${.MAKE} -r -f /dev/null -C /tmp -V .OBJDIR + @MAKEOBJDIR=${RO_OBJDIR} ${.MAKE} -r -f /dev/null -C ${TMPDIR} -V .OBJDIR ro-objdir: - @MAKEOBJDIR=${RO_OBJDIR} ${.MAKE} -r -f /dev/null -C /tmp -V .OBJDIR MAKE_OBJDIR_CHECK_WRITABLE=no + @MAKEOBJDIR=${RO_OBJDIR} ${.MAKE} -r -f /dev/null -C ${TMPDIR} -V .OBJDIR MAKE_OBJDIR_CHECK_WRITABLE=no explicit-objdir: - @MAKEOBJDIR=/tmp ${.MAKE} -r -f ${MAKEFILE:tA} -C /tmp do-objdir -V .OBJDIR + @MAKEOBJDIR=${TMPDIR} ${.MAKE} -r -f ${MAKEFILE:tA} -C ${TMPDIR} do-objdir -V .OBJDIR .endif |
