Module Name: src
Committed By: sjg
Date: Thu Aug 29 17:56:37 UTC 2024
Modified Files:
src/usr.bin/make/unit-tests: cmdline.exp cmdline.mk
Log Message:
make: unit-tests/cmdline do not remove TMPDIR
When running unit-tests in meta mode, removing TMPDIR while
still in use is fatal. Ensure that TMPBASE used by cmdline.mk
is a subdir of TMPDIR.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/cmdline.exp
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/cmdline.mk
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/cmdline.exp
diff -u src/usr.bin/make/unit-tests/cmdline.exp:1.4 src/usr.bin/make/unit-tests/cmdline.exp:1.5
--- src/usr.bin/make/unit-tests/cmdline.exp:1.4 Fri Jun 10 18:58:07 2022
+++ src/usr.bin/make/unit-tests/cmdline.exp Thu Aug 29 17:56:37 2024
@@ -1,7 +1,7 @@
makeobjdir-direct:
-show-objdir: <tmpdir>/6a8899d2-d227-4b55-9b6b-f3c8eeb83fd5
+show-objdir: <tmpdir>/cmdline/6a8899d2-d227-4b55-9b6b-f3c8eeb83fd5
makeobjdir-indirect:
-show-objdir: <tmpdir>/a7b41170-53f8-4cc2-bc5c-e4c3dd93ec45/
+show-objdir: <tmpdir>/cmdline/a7b41170-53f8-4cc2-bc5c-e4c3dd93ec45/
space-and-comment:
value # no comment $
value # no comment $
Index: src/usr.bin/make/unit-tests/cmdline.mk
diff -u src/usr.bin/make/unit-tests/cmdline.mk:1.6 src/usr.bin/make/unit-tests/cmdline.mk:1.7
--- src/usr.bin/make/unit-tests/cmdline.mk:1.6 Sun Aug 18 13:40:51 2024
+++ src/usr.bin/make/unit-tests/cmdline.mk Thu Aug 29 17:56:37 2024
@@ -1,8 +1,8 @@
-# $NetBSD: cmdline.mk,v 1.6 2024/08/18 13:40:51 rillig Exp $
+# $NetBSD: cmdline.mk,v 1.7 2024/08/29 17:56:37 sjg Exp $
#
# Tests for command line parsing and related special variables.
-TMPBASE?= ${TMPDIR:U/tmp/uid${.MAKE.UID}}
+TMPBASE?= ${TMPDIR:U/tmp/uid${.MAKE.UID}}/cmdline
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
