7 files changed, 27 insertions, 25 deletions
diff --git a/tests/scripts/features/double_colon b/tests/scripts/features/double_colon
index a039b0a9..7b55440b 100644
--- a/tests/scripts/features/double_colon
+++ b/tests/scripts/features/double_colon
@@ -83,7 +83,7 @@ if ($parallel_jobs) {
 
 # TEST 8: Test circular dependency check; PR/1671
 
-run_make_test(undef, "d", "ok\n$make_name: Circular d <- d dependency dropped.\noops\n");
+run_make_test(undef, "d", "ok\n$make_name: circular d <- d dependency dropped\noops\n");
 
 # TEST 8: I don't grok why this is different than the above, but it is...
 #
diff --git a/tests/scripts/features/implicit_search b/tests/scripts/features/implicit_search
index 57782c94..09cf4d79 100644
--- a/tests/scripts/features/implicit_search
+++ b/tests/scripts/features/implicit_search
@@ -177,7 +177,7 @@ all: hello.tsk
 %.o:$r %.c; \$(info hello.c)
 %.o:$r %.f %.tsk; \$(info hello.f)
 ", '-r',
-"#MAKE#: Circular hello.o <- hello.tsk dependency dropped.\nhello.f\nhello.tsk\n#MAKE#: Nothing to be done for 'all'.");
+"#MAKE#: circular hello.o <- hello.tsk dependency dropped\nhello.f\nhello.tsk\n#MAKE#: Nothing to be done for 'all'.");
 
 }
 
diff --git a/tests/scripts/features/include b/tests/scripts/features/include
index cedabf7f..c20e185b 100644
--- a/tests/scripts/features/include
+++ b/tests/scripts/features/include
@@ -432,9 +432,9 @@ all:; @echo hello
 include inc_b.mk
 %_a.mk %_b.mk:; exit 1
 !,
-              '', "exit 1\n#MAKEFILE#:4: Failed to remake makefile 'inc_b.mk'.\n", 512);
+              '', "exit 1\n#MAKEFILE#:4: failed to remake makefile 'inc_b.mk'", 512);
 
-run_make_test(undef, '-k', "exit 1\n#MAKEFILE#:4: Failed to remake makefile 'inc_b.mk'.\n", 512);
+run_make_test(undef, '-k', "exit 1\n#MAKEFILE#:4: failed to remake makefile 'inc_b.mk'", 512);
 
 # It seems wrong to me that this gives a different error message, but at
 # least it doesn't keep going.
@@ -446,7 +446,7 @@ include inc_a.mk
 !,
               '', "exit 1\n#MAKEFILE#:3: inc_a.mk: $ERR_no_such_file\n#MAKE#: *** [#MAKEFILE#:5: inc_a.mk] Error 1\n", 512);
 
-run_make_test(undef, '-k', "exit 1\n#MAKEFILE#:3: inc_a.mk: $ERR_no_such_file\n#MAKE#: *** [#MAKEFILE#:5: inc_a.mk] Error 1\n#MAKEFILE#:3: Failed to remake makefile 'inc_a.mk'.\n", 512);
+run_make_test(undef, '-k', "exit 1\n#MAKEFILE#:3: inc_a.mk: $ERR_no_such_file\n#MAKE#: *** [#MAKEFILE#:5: inc_a.mk] Error 1\n#MAKEFILE#:3: failed to remake makefile 'inc_a.mk'", 512);
 
 # Check the default makefiles... this requires us to invoke make with no
 # arguments.  Also check MAKEFILES
diff --git a/tests/scripts/features/jobserver b/tests/scripts/features/jobserver
index ad5f9e7f..f8cae542 100644
--- a/tests/scripts/features/jobserver
+++ b/tests/scripts/features/jobserver
@@ -14,7 +14,7 @@ if (!$parallel_jobs) {
 
 # Shorthand
 my $np = '--no-print-directory';
-my $j1err = "warning: jobserver unavailable: using -j1.  Add '+' to parent make rule.";
+my $j1err = "warning: jobserver unavailable: using -j1 (add '+' to parent make rule)";
 
 # Simple test of MAKEFLAGS settings
 run_make_test(q!
@@ -42,7 +42,7 @@ recurse: ; @echo $@: "/$(SHOW)/"; $(MAKE) -j3 -f #MAKEFILE# recurse2
 recurse2: ; @echo $@: "/$(SHOW)/"; $(MAKE) -f #MAKEFILE# all
 all:;@echo $@: "/$(SHOW)/"
 !,
-              "-j2 $np", "recurse: /-j2 --jobserver-auth=<auth> $np/\n#MAKE#[1]: warning: -j3 forced in submake: resetting jobserver mode.\nrecurse2: /-j3 --jobserver-auth=<auth> $np/\nall: /-j3 --jobserver-auth=<auth> $np/\n");
+              "-j2 $np", "recurse: /-j2 --jobserver-auth=<auth> $np/\n#MAKE#[1]: warning: -j3 forced in submake: resetting jobserver mode\nrecurse2: /-j3 --jobserver-auth=<auth> $np/\nall: /-j3 --jobserver-auth=<auth> $np/\n");
 
 # Test override of -jN with -j
 run_make_test(q!
@@ -51,7 +51,7 @@ recurse: ; @echo $@: "/$(SHOW)/"; $(MAKE) -j -f #MAKEFILE# recurse2
 recurse2: ; @echo $@: "/$(SHOW)/"; $(MAKE) -f #MAKEFILE# all
 all:;@echo $@: "/$(SHOW)/"
 !,
-              "-j2 $np", "recurse: /-j2 --jobserver-auth=<auth> $np/\n#MAKE#[1]: warning: -j0 forced in submake: resetting jobserver mode.\nrecurse2: /-j $np/\nall: /-j $np/\n");
+              "-j2 $np", "recurse: /-j2 --jobserver-auth=<auth> $np/\n#MAKE#[1]: warning: -j0 forced in submake: resetting jobserver mode\nrecurse2: /-j $np/\nall: /-j $np/\n");
 
 # Don't put --jobserver-auth into a re-exec'd MAKEFLAGS.
 # We can't test this directly because there's no way a makefile can
@@ -76,7 +76,7 @@ inc.mk:
 #> @echo 'MAKEFLAGS = $(MAKEFLAGS)'
 > @echo 'FOO = bar' > $@
 !,
-              "$np -j2", "#MAKE#[1]: warning: -j2 forced in submake: resetting jobserver mode.\nall\n");
+              "$np -j2", "#MAKE#[1]: warning: -j2 forced in submake: resetting jobserver mode\nall\n");
 
 unlink('inc.mk');
 
@@ -118,7 +118,7 @@ recurse: ; @echo hi
 !,
               '-w -j2', "#MAKE#: Entering directory '#PWD#'
 #MAKE#[1]: Entering directory '#PWD#'
-#MAKE#[1]: warning: -j1 forced in submake: resetting jobserver mode.
+#MAKE#[1]: warning: -j1 forced in submake: resetting jobserver mode
 hi
 #MAKE#[1]: Leaving directory '#PWD#'
 #MAKE#: Leaving directory '#PWD#'\n");
diff --git a/tests/scripts/features/mult_rules b/tests/scripts/features/mult_rules
index bddd501c..ca6a1afe 100644
--- a/tests/scripts/features/mult_rules
+++ b/tests/scripts/features/mult_rules
@@ -1,3 +1,5 @@
+#                                                                    -*-perl-*-
+
 $description = "\
 The following test creates a makefile to test the presence
 of multiple rules for one target.  One file can be the
@@ -21,8 +23,8 @@ print MAKEFILE <<EOF;
 objects = foo.o bar.o
 foo.o : defs.h
 bar.o : defs.h test.h
-extradeps = 
-\$(objects) : config.h \$(extradeps) 
+extradeps =
+\$(objects) : config.h \$(extradeps)
 \t\@echo EXTRA EXTRA
 EOF
 
@@ -36,7 +38,7 @@ if ($vos)
 {
    $error_code = 3307;
 }
-else 
+else
 {
    $error_code = 512;
 }
@@ -78,9 +80,9 @@ all: hello.c; $(info $@ from $^)
 hello.c: ; $(info 1 $@)
 src/hello.c: ; $(info 2 $@)
 !, '',
-    "#MAKEFILE#:4: Recipe was specified for file 'hello.c' at #MAKEFILE#:4,
-#MAKEFILE#:4: but 'hello.c' is now considered the same file as 'src/hello.c'.
-#MAKEFILE#:4: Recipe for 'hello.c' will be ignored in favor of the one for 'src/hello.c'.
+    "#MAKEFILE#:4: recipe was specified for file 'hello.c' at #MAKEFILE#:4,
+#MAKEFILE#:4: but 'hello.c' is now considered the same file as 'src/hello.c'
+#MAKEFILE#:4: recipe for 'hello.c' will be ignored in favor of the one for 'src/hello.c'
 2 src/hello.c
 all from src/hello.c
 #MAKE#: 'all' is up to date.\n");
diff --git a/tests/scripts/features/patternrules b/tests/scripts/features/patternrules
index 9b0113a7..aab4c3d0 100644
--- a/tests/scripts/features/patternrules
+++ b/tests/scripts/features/patternrules
@@ -475,7 +475,7 @@ unlink('1.all', '1.q', '1.r');
 run_make_test(q!
 %a %b : ; touch $*a
 !,
-              'gta', "touch gta\n#MAKEFILE#:2: warning: pattern recipe did not update peer target 'gtb'.\n");
+              'gta', "touch gta\n#MAKEFILE#:2: warning: pattern recipe did not update peer target 'gtb'\n");
 unlink(qw(gta));
 
 # We don't warn if we didn't update the file
@@ -497,7 +497,7 @@ all:;
 include gta
 %a %b : ; touch $*a
 !,
-              '', "touch gta\n#MAKEFILE#:4: warning: pattern recipe did not update peer target 'gtb'.\n#MAKE#: 'all' is up to date.");
+              '', "touch gta\n#MAKEFILE#:4: warning: pattern recipe did not update peer target 'gtb'\n#MAKE#: 'all' is up to date.");
 unlink(qw(gta));
 
 run_make_test(q!
@@ -505,7 +505,7 @@ run_make_test(q!
 %.o: %.c; touch $@
 foo.y: ; touch $@
 !,
-              'foo.o', "touch foo.y\ntouch foo.c\n#MAKEFILE#:2: warning: pattern recipe did not update peer target 'foo.h'.\ntouch foo.o\nrm foo.c");
+              'foo.o', "touch foo.y\ntouch foo.c\n#MAKEFILE#:2: warning: pattern recipe did not update peer target 'foo.h'\ntouch foo.o\nrm foo.c");
 unlink(qw(foo.y foo.c foo.o));
 
 if (0) {
diff --git a/tests/scripts/features/se_explicit b/tests/scripts/features/se_explicit
index 70fc65f8..a433ca91 100644
--- a/tests/scripts/features/se_explicit
+++ b/tests/scripts/features/se_explicit
@@ -185,9 +185,9 @@ foo: $$@.o ;
 # Not creating libcat.a here prevents segfault,
 libcat.a: ; @touch $@
 !,
-              '', q!#MAKEFILE#:16: Recipe was specified for file '-lcat' at #MAKEFILE#:16,
-#MAKEFILE#:16: but '-lcat' is now considered the same file as 'libcat.a'.
-#MAKEFILE#:16: Recipe for '-lcat' will be ignored in favor of the one for 'libcat.a'.!);
+              '', q!#MAKEFILE#:16: recipe was specified for file '-lcat' at #MAKEFILE#:16,
+#MAKEFILE#:16: but '-lcat' is now considered the same file as 'libcat.a'
+#MAKEFILE#:16: recipe for '-lcat' will be ignored in favor of the one for 'libcat.a'!);
 unlink('libcat.a');
 
 # SV 28456 : Don't reset $$< for default recipes
@@ -454,9 +454,9 @@ all: hello.c; $(info $@ from $^)
 hello.c: $$(info second expansion of hello.c prereqs); $(info 1 $@)
 src/hello.c: $$(info second expansion of src/hello.c prereqs); $(info 2 $@)
 !, '',
-"#MAKEFILE#:5: Recipe was specified for file 'hello.c' at #MAKEFILE#:5,
-#MAKEFILE#:5: but 'hello.c' is now considered the same file as 'src/hello.c'.
-#MAKEFILE#:5: Recipe for 'hello.c' will be ignored in favor of the one for 'src/hello.c'.
+"#MAKEFILE#:5: recipe was specified for file 'hello.c' at #MAKEFILE#:5,
+#MAKEFILE#:5: but 'hello.c' is now considered the same file as 'src/hello.c'
+#MAKEFILE#:5: recipe for 'hello.c' will be ignored in favor of the one for 'src/hello.c'
 second expansion of src/hello.c prereqs
 second expansion of hello.c prereqs
 2 src/hello.c