Module Name: src
Committed By: rillig
Date: Sat Nov 23 22:48:09 UTC 2024
Modified Files:
src/usr.bin/make/unit-tests: varname-dot-make-level.exp
varname-dot-make-level.mk
Log Message:
tests/make: demonstrate confusing error message for .MAKE.LEVEL.ENV
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/usr.bin/make/unit-tests/varname-dot-make-level.exp
cvs rdiff -u -r1.3 -r1.4 \
src/usr.bin/make/unit-tests/varname-dot-make-level.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/varname-dot-make-level.exp
diff -u src/usr.bin/make/unit-tests/varname-dot-make-level.exp:1.2 src/usr.bin/make/unit-tests/varname-dot-make-level.exp:1.3
--- src/usr.bin/make/unit-tests/varname-dot-make-level.exp:1.2 Sat Jun 1 18:44:05 2024
+++ src/usr.bin/make/unit-tests/varname-dot-make-level.exp Sat Nov 23 22:48:09 2024
@@ -1,4 +1,12 @@
level 1: variable 0, env 1
level 2: variable 1, env 2
level 3: variable 2, env 3
-exit status 0
+make: Cannot delete ".MAKE.LEVEL.ENV" as it is read-only
+make: Fatal errors encountered -- cannot continue
+make: stopped in unit-tests
+*** Error code 1 (continuing)
+`all' not remade because of errors.
+
+Stop.
+make: stopped making "all" in unit-tests
+exit status 1
Index: src/usr.bin/make/unit-tests/varname-dot-make-level.mk
diff -u src/usr.bin/make/unit-tests/varname-dot-make-level.mk:1.3 src/usr.bin/make/unit-tests/varname-dot-make-level.mk:1.4
--- src/usr.bin/make/unit-tests/varname-dot-make-level.mk:1.3 Sat Jun 1 18:44:05 2024
+++ src/usr.bin/make/unit-tests/varname-dot-make-level.mk Sat Nov 23 22:48:09 2024
@@ -1,9 +1,11 @@
-# $NetBSD: varname-dot-make-level.mk,v 1.3 2024/06/01 18:44:05 rillig Exp $
+# $NetBSD: varname-dot-make-level.mk,v 1.4 2024/11/23 22:48:09 rillig Exp $
#
# Tests for the special .MAKE.LEVEL variable, which informs about the
# recursion level. It is related to the environment variable MAKELEVEL,
# even though they don't have the same value.
+all: level_1 set-env
+
level_1: .PHONY
@printf 'level 1: variable %s, env %s\n' ${.MAKE.LEVEL} "$$${.MAKE.LEVEL.ENV}"
@${MAKE} -f ${MAKEFILE} level_2
@@ -20,3 +22,9 @@ level_3: .PHONY
.if make(level_2)
.unexport-env
.endif
+
+
+# FIXME: The error message "Cannot delete" is confusing.
+# expect: make: Cannot delete ".MAKE.LEVEL.ENV" as it is read-only
+set-env:
+ @${MAKE} -f /dev/null .MAKE.LEVEL.ENV=MAKELEVEL
