Changeset 3140 in kBuild for trunk/src/kmk/tests/scripts/options/dash-k

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/options/dash-k (modified) (4 diffs)

trunk/src/kmk/tests/scripts/options/dash-k

@@ -43 +43 @@
                "$workdir${pathsep}commands.c","$workdir${pathsep}display.c",
                "$workdir${pathsep}buffer.h",
-               "$workdir${pathsep}command.c");
+               "$workdir${pathsep}command.c");
 
 &touch(@files_to_touch);
@@ -58 +58 @@
 # Create the answer to what should be produced by this Makefile
 $answer = "cc -c main.c
-$make_name: *** No rule to make target `kbd.c', needed by `kbd.o'.
+$make_name: *** No rule to make target 'kbd.c', needed by 'kbd.o'.
 cc -c commands.c
 cc -c display.c
-$make_name: Target `edit' not remade because of errors.\n";
+$make_name: Target 'edit' not remade because of errors.\n";
 
 # COMPARE RESULTS
@@ -93 +93 @@
 
 $answer = "exit 1
-$make_name: *** [foo.o] Error 1
-$make_name: Target `all' not remade because of errors.\n";
+$make_name: *** [$makefile2:9: foo.o] Error 1
+$make_name: Target 'all' not remade because of errors.\n";
 
 &compare_output($answer, &get_logfile(1));
@@ -107 +107 @@
               '-k',
               "#MAKEFILE#:2: ifile: No such file or directory
-#MAKE#: *** No rule to make target `no-such-file', needed by `ifile'.
-#MAKE#: Failed to remake makefile `ifile'.
+#MAKE#: *** No rule to make target 'no-such-file', needed by 'ifile'.
+#MAKE#: Failed to remake makefile 'ifile'.
 hi\n",
               512);