Module Name: src
Committed By: rillig
Date: Sat Feb 25 09:02:45 UTC 2023
Modified Files:
src/usr.bin/make/unit-tests: varname-dot-makeflags.exp
varname-dot-makeflags.mk
Log Message:
tests/make: activate all tests for MAKEFLAGS
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/usr.bin/make/unit-tests/varname-dot-makeflags.exp \
src/usr.bin/make/unit-tests/varname-dot-makeflags.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-makeflags.exp
diff -u src/usr.bin/make/unit-tests/varname-dot-makeflags.exp:1.2 src/usr.bin/make/unit-tests/varname-dot-makeflags.exp:1.3
--- src/usr.bin/make/unit-tests/varname-dot-makeflags.exp:1.2 Sat Feb 25 06:54:08 2023
+++ src/usr.bin/make/unit-tests/varname-dot-makeflags.exp Sat Feb 25 09:02:45 2023
@@ -1,3 +1,7 @@
+spaces_stage_0: MAKEFLAGS=< -r -k >
+spaces_stage_0: env MAKEFLAGS=< -r -k >
+spaces_stage_1: MAKEFLAGS=< -r -k -d 00000 -D VARNAME WITH SPACES >
+spaces_stage_1: env MAKEFLAGS=< -r -k -d 00000 -D VARNAME WITH SPACES >
dollars_stage_0: MAKEFLAGS=< -r -k >
dollars_stage_1: env MAKEFLAGS=< -r -k DOLLARS=\$\{varname\}>
dollars_stage_1: MAKEFLAGS=< -r -k DOLLARS=\{varname\}>
@@ -8,4 +12,8 @@ dollars_stage_2: MAKEFLAGS=< -r -k DOLLA
dollars_stage_3: env MAKEFLAGS=< -r -k DOLLARS=>
dollars_stage_3: dollars=<>
dollars_stage_3: MAKEFLAGS=< -r -k DOLLARS=>
+append_stage_0: MAKEFLAGS=< -r -k >
+append_stage_1: MAKEFLAGS=< -r -k -D before-0 -D after-0 VAR0=value>
+append_stage_2: MAKEFLAGS=< -r -k -D before-0 -D after-0 -D before-1 -D after-1 VAR0=value VAR1=value>
+append_stage_3: MAKEFLAGS=< -r -k -D before-0 -D after-0 -D before-1 -D after-1 -D before-2 -D after-2 VAR0=value VAR1=value VAR2=value>
exit status 0
Index: src/usr.bin/make/unit-tests/varname-dot-makeflags.mk
diff -u src/usr.bin/make/unit-tests/varname-dot-makeflags.mk:1.2 src/usr.bin/make/unit-tests/varname-dot-makeflags.mk:1.3
--- src/usr.bin/make/unit-tests/varname-dot-makeflags.mk:1.2 Sat Feb 25 06:54:08 2023
+++ src/usr.bin/make/unit-tests/varname-dot-makeflags.mk Sat Feb 25 09:02:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: varname-dot-makeflags.mk,v 1.2 2023/02/25 06:54:08 rillig Exp $
+# $NetBSD: varname-dot-makeflags.mk,v 1.3 2023/02/25 09:02:45 rillig Exp $
#
# Tests for the special .MAKEFLAGS variable, which collects almost all
# command line arguments and passes them on to any child processes via
@@ -7,7 +7,7 @@
# See also:
# varname-dot-makeoverrides.mk
-all: dollars_stage_0 #spaces_stage_0 dollars_stage_0 append_stage_0
+all: spaces_stage_0 dollars_stage_0 append_stage_0
# When options are parsed, the option and its argument are appended as
@@ -26,6 +26,7 @@ spaces_stage_1:
@echo '$@: MAKEFLAGS=<'${MAKEFLAGS:Q}'>'
@echo "$@: env MAKEFLAGS=<$$MAKEFLAGS>"
+
# Demonstrate that '$' characters are altered when they are passed on to child
# make processes via MAKEFLAGS.
dollars_stage_0: