diff options
| author | Paul Smith <psmith@gnu.org> | 2013-05-04 13:10:56 -0400 |
|---|---|---|
| committer | Paul Smith <psmith@gnu.org> | 2013-05-04 13:10:56 -0400 |
| commit | b8467292c9be14b31c028d472107946770ed977e (patch) | |
| tree | 83a4a38f0209303e73e93d03218528e1ba07c366 /tests | |
| parent | cb2be0db36b9730d9879dec4332141ee4db9377f (diff) | |
| download | gunmake-b8467292c9be14b31c028d472107946770ed977e.tar.gz | |
Improve sync handling for -Ojob/-Otarget and recursion.
If we are not going to sync a command line then dump any collected output
first to preserve ordering. Do some code cleanup:
* Move the handle init to a separate function.
* Move the temp file truncation to the output function.
* Remember whether we sync in a variable for readability.
* Handle EINTR and short writes in child_out().
* Always call sync_output() in case output_sync was changed due to error.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ChangeLog | 5 | ||||
| -rw-r--r-- | tests/scripts/features/output-sync | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index 0a72ebf..991e96f 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2013-05-04 Paul Smith <psmith@gnu.org> + + * scripts/features/output-sync (output_sync_set): New test for + ordered recursive output for -Ojob / -Otarget. + 2013-05-03 Eli Zaretskii <eliz@gnu.org> * scripts/features/load: Fix signatures of testload_gmk_setup and diff --git a/tests/scripts/features/output-sync b/tests/scripts/features/output-sync index c8ff291..a1560ad 100644 --- a/tests/scripts/features/output-sync +++ b/tests/scripts/features/output-sync @@ -244,5 +244,15 @@ foo: end # Remove temporary directories and contents. output_sync_clean(); +# Ensure recursion doesn't mis-order or double-print output +run_make_test(qq! +all: +\t\@echo foo +\t\@+echo bar +!, + '-j -Ojob', "foo\nbar\n"); + +run_make_test(undef, '-j -Otarget', "foo\nbar\n"); + # This tells the test driver that the perl test script executed properly. 1; |