Module Name: src
Committed By: rillig
Date: Sat Sep 12 10:39:34 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: cond-cmp-string.exp cond1.exp
Log Message:
make(1): fix wording of parse error in conditionals
The word "should" is not appropriate for situations that eventually lead
to a parse error.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/cond-cmp-string.exp
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/cond1.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/cond-cmp-string.exp
diff -u src/usr.bin/make/unit-tests/cond-cmp-string.exp:1.3 src/usr.bin/make/unit-tests/cond-cmp-string.exp:1.4
--- src/usr.bin/make/unit-tests/cond-cmp-string.exp:1.3 Fri Sep 11 15:33:28 2020
+++ src/usr.bin/make/unit-tests/cond-cmp-string.exp Sat Sep 12 10:39:34 2020
@@ -1,6 +1,6 @@
make: "cond-cmp-string.mk" line 18: Malformed conditional (str != str)
make: "cond-cmp-string.mk" line 37: Malformed conditional ("string" != "str""ing")
-make: "cond-cmp-string.mk" line 42: warning: String comparison operator should be either == or !=
+make: "cond-cmp-string.mk" line 42: warning: String comparison operator must be either == or !=
make: "cond-cmp-string.mk" line 42: Malformed conditional (!("value" = "value"))
make: "cond-cmp-string.mk" line 49: Malformed conditional (!("value" === "value"))
make: Fatal errors encountered -- cannot continue
Index: src/usr.bin/make/unit-tests/cond1.exp
diff -u src/usr.bin/make/unit-tests/cond1.exp:1.1 src/usr.bin/make/unit-tests/cond1.exp:1.2
--- src/usr.bin/make/unit-tests/cond1.exp:1.1 Thu Aug 21 13:44:51 2014
+++ src/usr.bin/make/unit-tests/cond1.exp Sat Sep 12 10:39:34 2020
@@ -16,7 +16,7 @@ Passed:
4 is not prime
5 is prime
-make: warning: String comparison operator should be either == or !=
+make: warning: String comparison operator must be either == or !=
make: Bad conditional expression `"0" > 0' in "0" > 0?OK:No
OK
