Module Name: src Committed By: rillig Date: Sun May 10 13:03:40 UTC 2020
Modified Files: src/usr.bin/make/unit-tests: dollar.exp dollar.mk Log Message: usr.bin/make: fix typo in dollar test To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/dollar.exp \ src/usr.bin/make/unit-tests/dollar.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/dollar.exp diff -u src/usr.bin/make/unit-tests/dollar.exp:1.1 src/usr.bin/make/unit-tests/dollar.exp:1.2 --- src/usr.bin/make/unit-tests/dollar.exp:1.1 Sun May 10 12:34:01 2020 +++ src/usr.bin/make/unit-tests/dollar.exp Sun May 10 13:03:40 2020 @@ -15,8 +15,8 @@ This works as expected. 4 dollar variable => <$$> Some hungry part of make eats all the dollars after a :U modifier. 1 dollar var-default => <> - 2 dollar var-default => <> - 4 dollar var-default => <> + 2 dollar var-default => <$> + 4 dollar var-default => <$$> Dollar in :S pattern Index: src/usr.bin/make/unit-tests/dollar.mk diff -u src/usr.bin/make/unit-tests/dollar.mk:1.1 src/usr.bin/make/unit-tests/dollar.mk:1.2 --- src/usr.bin/make/unit-tests/dollar.mk:1.1 Sun May 10 12:34:01 2020 +++ src/usr.bin/make/unit-tests/dollar.mk Sun May 10 13:03:40 2020 @@ -1,4 +1,4 @@ -# $NetBSD: dollar.mk,v 1.1 2020/05/10 12:34:01 rillig Exp $ +# $NetBSD: dollar.mk,v 1.2 2020/05/10 13:03:40 rillig Exp $ # # Test the various places where a dollar character can appear and # see what happens. There are lots of surprises here. @@ -38,9 +38,9 @@ all: $T '4 dollar variable' ''${DOLLAR4:Q} $C 'Some hungry part of make eats all the dollars after a :U modifier.' - $T '1 dollar var-default' ''${U:${DOLLAR1}:Q} - $T '2 dollar var-default' ''${U:${DOLLAR2}:Q} - $T '4 dollar var-default' ''${U:${DOLLAR4}:Q} + $T '1 dollar var-default' ''${:U${DOLLAR1}:Q} + $T '2 dollar var-default' ''${:U${DOLLAR2}:Q} + $T '4 dollar var-default' ''${:U${DOLLAR4}:Q} $H 'Dollar in :S pattern'