diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ChangeLog | 1 | ||||
| -rw-r--r-- | tests/scripts/features/output-sync | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index 4d11706..d98e938 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -3,6 +3,7 @@ * scripts/features/output-sync (output_sync_set): Remove extraneous enter/leave lines, which are no longer printed. Add tests for syncing command line printing. + (output_sync_set): Rename options: "job"->"line"; "make"->"recurse" 2013-05-04 Paul Smith <psmith@gnu.org> diff --git a/tests/scripts/features/output-sync b/tests/scripts/features/output-sync index e7edfce..d760885 100644 --- a/tests/scripts/features/output-sync +++ b/tests/scripts/features/output-sync @@ -125,7 +125,7 @@ all: make-foo make-bar make-foo: ; \$(MAKE) -C foo make-bar: ; \$(MAKE) -C bar!, - '-j -Omake', + '-j -Orecurse', "#MAKEPATH# -C foo #MAKE#[1]: Entering directory '#PWD#/foo' foo: start @@ -208,7 +208,7 @@ all: make-foo make-bar make-foo: ; \$(MAKE) -C foo foo-job make-bar: ; $sleep_command 1 ; \$(MAKE) -C bar bar-job!, - '-j --output-sync=job', + '-j --output-sync=line', "#MAKEPATH# -C foo foo-job $sleep_command 1 ; #MAKEPATH# -C bar bar-job #MAKE#[1]: Entering directory '#PWD#/foo' @@ -234,7 +234,7 @@ all: \t\@echo foo \t\@+echo bar !, - '-j -Ojob', "foo\nbar\n"); + '-j -Oline', "foo\nbar\n"); run_make_test(undef, '-j -Otarget', "foo\nbar\n"); @@ -244,7 +244,7 @@ all: \t\@echo foobar \ttrue !, - '-j -Ojob', "foobar\ntrue\n"); + '-j -Oline', "foobar\ntrue\n"); run_make_test(undef, '-j -Otarget', "foobar\ntrue\n"); |