summaryrefslogtreecommitdiff
path: root/tests/scripts/features
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
commit6cefcf03764e6ef5fa1d626e18add7b6469300b4 (patch)
treef4aa139eaa7cd62e90cf918e96e77402b7355f8f /tests/scripts/features
parentbe8bf3e3850cea0de529e364174e79114d0b0b9d (diff)
downloadmake-6cefcf03764e6ef5fa1d626e18add7b6469300b4.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/scripts/features')
-rw-r--r--tests/scripts/features/output-sync8
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/scripts/features/output-sync b/tests/scripts/features/output-sync
index d1b743d3..c8ff2911 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