Changeset 3140 in kBuild for trunk/src/kmk/tests/scripts/features/escape

Timestamp:

Mar 14, 2018 9:28:10 PM (7 years ago)

Author:

bird

Message:

kmk: Merged in changes from GNU make 4.2.1 (2e55f5e4abdc0e38c1d64be703b446695e70b3b6 / ​https://git.savannah.gnu.org/git/make.git).

Location:

trunk/src/kmk

Files:

• . (modified) (1 prop)
• tests/scripts/features/escape (modified) (4 diffs)

trunk/src/kmk/tests/scripts/features/escape

@@ -3 +3 @@
 
 $details = "\
-Make sure that escaping of `:' works in target names.
+Make sure that escaping of ':' works in target names.
 Make sure escaping of whitespace works in target names.
-Make sure that escaping of '#' works.";
-
-
-close(MAKEFILE);
+Make sure that escaping of '#' works.
+Make sure that backslash before non-special characters are kept.";
 
 
@@ -27 +25 @@
 run_make_test(undef,
               'path=pre:',
-              "#MAKEFILE#:2: *** target pattern contains no `%' (target `foo').  Stop.",
+              "#MAKEFILE#:2: *** target pattern contains no '%' (target 'foo').  Stop.",
               512);
 
@@ -40 +38 @@
 run_make_test(undef,
               "'path=pre\\\\:'",
-              "#MAKEFILE#:2: *** target pattern contains no `%' (target `foo').  Stop.",
+              "#MAKEFILE#:2: *** target pattern contains no '%'  (target 'foo').  Stop.",
               512);
 
@@ -55 +53 @@
               'foo#bar.ext = (foo#bar.ext)');
 
+# Test escaped colons in prerequisites
+# Quoting of backslashes in q!! is kind of messy.
+# Solaris sh does not properly handle backslashes even in '' so just
+# check the output make prints, not what the shell interprets.
+run_make_test(q!
+foo: foo\\:bar foo\\\\\\:bar foo\\\\\\\\\\:bar
+foo foo\\:bar foo\\\\\\:bar foo\\\\\\\\\\:bar: ; : '$@'
+!,
+              '', ": 'foo:bar'\n: 'foo\\:bar'\n: 'foo\\\\:bar'\n: 'foo'\n");
+
+# Test backslash before non-special chars: should be kept as-is
+
+run_make_test(q!
+all: ..\foo
+.DEFAULT: ; : '$@'
+!,
+              '', ": '..\\foo'\n");
+
 # This tells the test driver that the perl test script executed properly.
 1;