diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2021-02-11 06:01:59 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2021-02-15 16:53:34 +0000 |
| commit | 78968ce3ddbf56ac7f7b548cfe8d39707f9989d8 (patch) | |
| tree | e4880e79bf9ef574d1379d8639a9077fd7949518 /contrib/bmake/unit-tests/cmdline.mk | |
| parent | 928cbdbe39109cdc0075e4cc1a6aa144a8ef8146 (diff) | |
Merge bmake-20210206
Changes of interest
o unit-tests: use private TMPDIR to avoid errors from other users
o avoid strdup in mkTempFile
o always use vfork
o job.c: do not create empty shell files in jobs mode
reduce unnecessary calls to waitpid
o cond.c: fix debug output for comparison operators in conditionals
(cherry picked from commit dba7b0ef928af88caa38728a73657b837aeeac93)
Approved by: re
Diffstat (limited to 'contrib/bmake/unit-tests/cmdline.mk')
| -rw-r--r-- | contrib/bmake/unit-tests/cmdline.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/bmake/unit-tests/cmdline.mk b/contrib/bmake/unit-tests/cmdline.mk index a3e2de984927..f82e7f967ef8 100644 --- a/contrib/bmake/unit-tests/cmdline.mk +++ b/contrib/bmake/unit-tests/cmdline.mk @@ -1,8 +1,8 @@ -# $NetBSD: cmdline.mk,v 1.2 2020/11/15 14:07:53 rillig Exp $ +# $NetBSD: cmdline.mk,v 1.3 2021/02/06 18:26:03 sjg Exp $ # # Tests for command line parsing and related special variables. -TMPBASE?= /tmp/uid${.MAKE.UID} +TMPBASE?= ${TMPDIR:U/tmp/uid${.MAKE.UID}} SUB1= a7b41170-53f8-4cc2-bc5c-e4c3dd93ec45 # just a random UUID SUB2= 6a8899d2-d227-4b55-9b6b-f3c8eeb83fd5 # just a random UUID MAKE_CMD= env TMPBASE=${TMPBASE}/${SUB1} ${.MAKE} -f ${MAKEFILE} -r |