github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2026-09-01 04:08:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

* job.c (child_error): Modify error message string.

Browse Source 
Ensure Emacs compile-mode's next-error doesn't match target failure
messages.  Syntax errors in makefiles are still matched.
This commit is contained in:
Paul Smith
2017-10-28 18:45:30 -04:00
parent b9c25de370
commit 6264deece3
12 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/scripts/features/output-sync
View File

@@ -206,9 +206,9 @@ bar: end
#MAKE#[1]: Entering directory '#PWD#/foo'
foo-fail: start
foo-fail: end
#MAKE#[1]: *** [Makefile:23: foo-fail] Error 1
#MAKE#[1]: *** [Makefile;23: foo-fail] Error 1
#MAKE#[1]: Leaving directory '#PWD#/foo'
#MAKE#: *** [#MAKEFILE#:4: make-foo-fail] Error 2\n",
#MAKE#: *** [#MAKEFILE#;4: make-foo-fail] Error 2\n",
512);
# Test the per-job synchronization.
@@ -326,7 +326,7 @@ run_make_test(qq!
all: t1
t1: ; -\@\$(MAKE) -f $m1
!,
"-j -Oline", "#MAKE#[1]: Entering directory '#PWD#'\nd1 stderr\nd1 stdout\n$m1:3: *** d1 failed. Stop.\n#MAKE#[1]: Leaving directory '#PWD#'\n#MAKE#: [#MAKEFILE#:3: t1] Error 2 (ignored)\n");
"-j -Oline", "#MAKE#[1]: Entering directory '#PWD#'\nd1 stderr\nd1 stdout\n$m1:3: *** d1 failed. Stop.\n#MAKE#[1]: Leaving directory '#PWD#'\n#MAKE#: [#MAKEFILE#;3: t1] Error 2 (ignored)\n");
rmfiles($m1);
@@ -343,7 +343,7 @@ if ($port_type ne 'W32') {
run_make_test(q!
all:: ; @./foo bar baz
!,
'-O', "#MAKE#: ./foo: Command not found\n#MAKE#: *** [#MAKEFILE#:2: all] Error 127\n", 512);
'-O', "#MAKE#: ./foo: Command not found\n#MAKE#: *** [#MAKEFILE#;2: all] Error 127\n", 512);
}
# This tells the test driver that the perl test script executed properly.