Module Name: src
Committed By: sjg
Date: Sat Jan 25 22:46:30 UTC 2025
Modified Files:
src/usr.bin/make/unit-tests: Makefile
Log Message:
make/unit-tests: avoid failure on NFS
The 'rm -rf ${TMPDIR}' at the end of the 'test' target, fails
when building on NFS because the temp file used for the target script
keeps the directory from being empty.
Move it to a separate target attached to '.END'
Reviewed by: rillig
To generate a diff of this commit:
cvs rdiff -u -r1.354 -r1.355 src/usr.bin/make/unit-tests/Makefile
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.354 src/usr.bin/make/unit-tests/Makefile:1.355
--- src/usr.bin/make/unit-tests/Makefile:1.354 Fri Jan 10 23:00:38 2025
+++ src/usr.bin/make/unit-tests/Makefile Sat Jan 25 22:46:30 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.354 2025/01/10 23:00:38 rillig Exp $
+# $NetBSD: Makefile,v 1.355 2025/01/25 22:46:30 sjg Exp $
#
# Unit tests for make(1)
#
@@ -47,6 +47,11 @@ TMPDIR:= /tmp/uid${.MAKE.UID}
.if !exist(${TMPDIR})
_!= mkdir -p ${TMPDIR}
.endif
+# and clean it up - outside the context of
+# any target that might be using it.
+.END: rm-tmpdir
+rm-tmpdir: .NOMETA
+ @rm -rf ${TMPDIR}
# Each test is in a sub-makefile.
# Keep the list sorted.
@@ -781,7 +786,6 @@ test: ${OUTFILES} .PHONY
if [ "$$have_lua" = "yes" ]; then \
(cd ${.CURDIR} && "$$lua" ./check-expect.lua *.mk); \
fi; \
- rm -rf ${TMPDIR}; \
fi
accept:
