Module Name: src
Committed By: sjg
Date: Sat Oct 10 19:25:19 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: Makefile export.exp
Log Message:
Limit output of export tests to POSIX compatible env vars
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/export.exp
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.164 src/usr.bin/make/unit-tests/Makefile:1.165
--- src/usr.bin/make/unit-tests/Makefile:1.164 Thu Oct 8 19:11:35 2020
+++ src/usr.bin/make/unit-tests/Makefile Sat Oct 10 19:25:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.164 2020/10/08 19:11:35 rillig Exp $
+# $NetBSD: Makefile,v 1.165 2020/10/10 19:25:19 sjg Exp $
#
# Unit tests for make(1)
#
@@ -393,6 +393,12 @@ FLAGS.varname-dot-shell= -dpv
FLAGS.varname-empty= -dv '$${:U}=cmdline-u' '=cmline-plain'
# Some tests need extra postprocessing.
+SED_CMDS.export= \
+ -e '/^[^=_A-Za-z0-9]*=/d'
+# these all share the same requirement
+.for t in export-all export-env
+SED_CMDS.$t= ${SED_CMDS.export}
+.endfor
SED_CMDS.job-output-long-lines= \
${:D Job separators on their own line are ok. } \
-e '/^--- job-[ab] ---$$/d' \
Index: src/usr.bin/make/unit-tests/export.exp
diff -u src/usr.bin/make/unit-tests/export.exp:1.4 src/usr.bin/make/unit-tests/export.exp:1.5
--- src/usr.bin/make/unit-tests/export.exp:1.4 Sat Aug 22 19:30:58 2020
+++ src/usr.bin/make/unit-tests/export.exp Sat Oct 10 19:25:19 2020
@@ -1,4 +1,3 @@
-&=ampersand
MAKELEVEL=1
UT_DOLLAR=This is $UT_FU
UT_FOO=foobar is fubar
