Fri Oct 30 23:54:42 2020 UTC ()
Fix directive-unexport to focus only on the variables we care about


(sjg)
diff -r1.2 -r1.3 src/usr.bin/make/unit-tests/directive-unexport.exp
diff -r1.3 -r1.4 src/usr.bin/make/unit-tests/directive-unexport.mk

cvs diff -r1.2 -r1.3 src/usr.bin/make/unit-tests/directive-unexport.exp (expand / switch to context diff)
--- src/usr.bin/make/unit-tests/directive-unexport.exp 2020/10/30 17:55:10 1.2
+++ src/usr.bin/make/unit-tests/directive-unexport.exp 2020/10/30 23:54:42 1.3
@@ -1,5 +1,5 @@
-make: "directive-unexport.mk" line 14: A=a B=b C=c
-make: "directive-unexport.mk" line 15: A B C
-make: "directive-unexport.mk" line 23: A=a B=b C=c
+make: "directive-unexport.mk" line 14: UT_A=a UT_B=b UT_C=c
+make: "directive-unexport.mk" line 15: UT_A UT_B UT_C
+make: "directive-unexport.mk" line 23: UT_A=a UT_B=b UT_C=c
 make: "directive-unexport.mk" line 24: 
 exit status 0

cvs diff -r1.3 -r1.4 src/usr.bin/make/unit-tests/directive-unexport.mk (expand / switch to context diff)
--- src/usr.bin/make/unit-tests/directive-unexport.mk 2020/10/30 17:55:10 1.3
+++ src/usr.bin/make/unit-tests/directive-unexport.mk 2020/10/30 23:54:42 1.4
@@ -1,17 +1,17 @@
-# $NetBSD: directive-unexport.mk,v 1.3 2020/10/30 17:55:10 rillig Exp $
+# $NetBSD: directive-unexport.mk,v 1.4 2020/10/30 23:54:42 sjg Exp $
 #
 # Tests for the .unexport directive.
 
 # TODO: Implementation
 
 # First, export 3 variables.
-A=	a
-B=	b
-C=	c
-.export A B C
+UT_A=	a
+UT_B=	b
+UT_C=	c
+.export UT_A UT_B UT_C
 
 # Show the exported variables and their values.
-.info ${:!env|sort|grep -v -E '^(MAKELEVEL|MALLOC_OPTIONS|PATH|PWD)'!}
+.info ${:!env|sort|grep '^UT_'!}
 .info ${.MAKE.EXPORTED}
 
 # XXX: Now try to unexport all of them.  The variables are still exported
@@ -20,7 +20,7 @@
 *=	asterisk
 .unexport *
 
-.info ${:!env|sort|grep -v -E '^(MAKELEVEL|MALLOC_OPTIONS|PATH|PWD)'!}
+.info ${:!env|sort|grep '^UT_'!}
 .info ${.MAKE.EXPORTED}
 
 all: