summaryrefslogtreecommitdiff
path: root/usr.bin/make/unit-tests
diff options
context:
space:
mode:
authorsjg <sjg@NetBSD.org>2008-05-15 21:05:54 +0000
committersjg <sjg@NetBSD.org>2008-05-15 21:05:54 +0000
commitf2c43a72d5a2cafc08497ceabccdfd8a58b6ed76 (patch)
treeafb73dfbecbb011c3087ff1d3f4bc059394eb529 /usr.bin/make/unit-tests
parentf147f68f575ae2624bcf2e3a40e63dd252da4896 (diff)
VAR_CMD context is used by conditionals and other purposes, so
actually set VAR_FROM_CMD when appropriate and only skip setting in VAR_GLOBAL when that flag is set.
Diffstat (limited to 'usr.bin/make/unit-tests')
-rw-r--r--usr.bin/make/unit-tests/test.exp4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/make/unit-tests/test.exp b/usr.bin/make/unit-tests/test.exp
index 9cfaed9c953..0b32046231a 100644
--- a/usr.bin/make/unit-tests/test.exp
+++ b/usr.bin/make/unit-tests/test.exp
@@ -302,5 +302,5 @@ three FU=<v>bar</v> FOO=<v>goo</v> VAR=<v></v>
four FU=<v>bar</v> FOO=<v>goo</v> VAR=<v>Internal</v>
five FU=<v>bar</v> FOO=<v>goo</v> VAR=<v>Internal</v>
five v=is x k=is x
-six v=is x k=is x
-show-v v=override k=is x
+six v=is y k=is y
+show-v v=override k=override