summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2013-04-28 19:09:20 -0400
committerPaul Smith <psmith@gnu.org>2013-04-28 19:09:20 -0400
commitf88eb23b02088e7549c46231d0dfa4ee8d35a365 (patch)
treef4aa139eaa7cd62e90cf918e96e77402b7355f8f /tests
parent441b64335590ab91854b997bec07a9578086d895 (diff)
downloadgunmake-f88eb23b02088e7549c46231d0dfa4ee8d35a365.tar.gz
Ensure error messages are printed with sync'd output.
Enhance the child_error() function so that it will write error output to the child's sync output buffer, if it exists. If it doesn't the output goes to stdout/stderr.
Diffstat (limited to 'tests')
-rw-r--r--tests/ChangeLog1
-rw-r--r--tests/scripts/features/output-sync8
2 files changed, 3 insertions, 6 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 642ba85..98c5970 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -2,6 +2,7 @@
* scripts/features/output-sync (output_sync_set): Add tests for
the per-job syntax mode.
+ (output_sync_set): Test improved error message location.
2013-04-15 Paul Smith <psmith@gnu.org>
diff --git a/tests/scripts/features/output-sync b/tests/scripts/features/output-sync
index d1b743d..c8ff291 100644
--- a/tests/scripts/features/output-sync
+++ b/tests/scripts/features/output-sync
@@ -197,14 +197,10 @@ bar: end
#MAKE#[1]: Leaving directory '#PWD#/bar'
#MAKE#[1]: Leaving directory '#PWD#/bar'
#MAKE#[1]: Entering directory '#PWD#/foo'
-Makefile:20: recipe for target 'foo-fail' failed
-#MAKE#[1]: Leaving directory '/home/psmith/src/make/make/tests/foo'
-#MAKE#[1]: Entering directory '/home/psmith/src/make/make/tests/foo'
-#MAKE#[1]: *** [foo-fail] Error 1
-#MAKE#[1]: Leaving directory '/home/psmith/src/make/make/tests/foo'
-#MAKE#[1]: Entering directory '/home/psmith/src/make/make/tests/foo'
foo-fail: start
foo-fail: end
+Makefile:20: recipe for target 'foo-fail' failed
+#MAKE#[1]: *** [foo-fail] Error 1
#MAKE#[1]: Leaving directory '#PWD#/foo'
#MAKE#[1]: Leaving directory '#PWD#/foo'
#MAKEFILE#:4: recipe for target 'make-foo-fail' failed