Module Name: src
Committed By: rillig
Date: Sun Aug 18 13:40:51 UTC 2024
Modified Files:
src/usr.bin/make/unit-tests: Makefile cmdline.mk
Log Message:
tests/make: clean up private temporary directory after running tests
Fixes PR bin/58569.
To generate a diff of this commit:
cvs rdiff -u -r1.350 -r1.351 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.5 -r1.6 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/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.350 src/usr.bin/make/unit-tests/Makefile:1.351
--- src/usr.bin/make/unit-tests/Makefile:1.350 Sun Jul 7 09:37:00 2024
+++ src/usr.bin/make/unit-tests/Makefile Sun Aug 18 13:40:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.350 2024/07/07 09:37:00 rillig Exp $
+# $NetBSD: Makefile,v 1.351 2024/08/18 13:40:51 rillig Exp $
#
# Unit tests for make(1)
#
@@ -779,6 +779,7 @@ test: ${OUTFILES} .PHONY
if [ "$$have_lua" = "yes" ]; then \
(cd ${.CURDIR} && "$$lua" ./check-expect.lua *.mk); \
fi; \
+ rm -rf ${TMPDIR}; \
fi
accept:
Index: src/usr.bin/make/unit-tests/cmdline.mk
diff -u src/usr.bin/make/unit-tests/cmdline.mk:1.5 src/usr.bin/make/unit-tests/cmdline.mk:1.6
--- src/usr.bin/make/unit-tests/cmdline.mk:1.5 Tue Apr 23 22:51:28 2024
+++ src/usr.bin/make/unit-tests/cmdline.mk Sun Aug 18 13:40:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: cmdline.mk,v 1.5 2024/04/23 22:51:28 rillig Exp $
+# $NetBSD: cmdline.mk,v 1.6 2024/08/18 13:40:51 rillig Exp $
#
# Tests for command line parsing and related special variables.
@@ -12,6 +12,7 @@ DIR12= ${TMPBASE}/${SUB1}/${SUB2}
all: prepare-dirs
all: makeobjdir-direct makeobjdir-indirect
all: space-and-comment
+all: cleanup
prepare-dirs:
@rm -rf ${DIR2} ${DIR12}
@@ -56,3 +57,6 @@ space-and-comment: .PHONY
@env -i MAKEFLAGS="' VAR= value # no comment '" \
${MAKE} -r -f /dev/null -v VAR \
| sed 's,$$,$$,'
+
+cleanup:
+ @rm -rf ${TMPBASE}
