diff options
Diffstat (limited to 'tests/scripts/features/output-sync')
-rw-r--r-- | tests/scripts/features/output-sync | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/tests/scripts/features/output-sync b/tests/scripts/features/output-sync index b4541fb..55af0a1 100644 --- a/tests/scripts/features/output-sync +++ b/tests/scripts/features/output-sync @@ -135,6 +135,8 @@ foo: end #MAKE#[1]: Entering directory '#PWD#/bar' bar: start bar: end +#MAKE#[1]: Leaving directory '#PWD#/bar' +#MAKE#[1]: Entering directory '#PWD#/bar' baz: start baz: end #MAKE#[1]: Leaving directory '#PWD#/bar'\n", 0, 6); @@ -146,6 +148,9 @@ baz: end unlink(@syncfiles); run_make_test(qq! +x=1 +\$xMAKEFLAGS += --no-print-directory + all: make-foo make-bar make-foo: ; \$(MAKE) -C foo @@ -157,14 +162,28 @@ $sleep_command 1 ; #MAKEPATH# -C bar #MAKE#[1]: Entering directory '#PWD#/bar' bar: start bar: end +#MAKE#[1]: Leaving directory '#PWD#/bar' #MAKE#[1]: Entering directory '#PWD#/foo' foo: start foo: end #MAKE#[1]: Leaving directory '#PWD#/foo' +#MAKE#[1]: Entering directory '#PWD#/bar' baz: start baz: end #MAKE#[1]: Leaving directory '#PWD#/bar'\n", 0, 6); +# Rerun but this time suppress the directory tracking +unlink(@syncfiles); +run_make_test(undef, '-j --output-sync=target x=', + "#MAKEPATH# -C foo +$sleep_command 1 ; #MAKEPATH# -C bar +bar: start +bar: end +foo: start +foo: end +baz: start +baz: end\n", 0, 6); + # Test that messages from make itself are enclosed with # "Entering/Leaving directory" messages. unlink(@syncfiles); @@ -209,10 +228,14 @@ make-bar: ; $sleep_command 1 ; \$(MAKE) -C bar bar-job!, $sleep_command 1 ; #MAKEPATH# -C bar bar-job #MAKE#[1]: Entering directory '#PWD#/foo' foo: start +#MAKE#[1]: Leaving directory '#PWD#/foo' #MAKE#[1]: Entering directory '#PWD#/bar' bar: start +#MAKE#[1]: Leaving directory '#PWD#/bar' +#MAKE#[1]: Entering directory '#PWD#/bar' bar: end #MAKE#[1]: Leaving directory '#PWD#/bar' +#MAKE#[1]: Entering directory '#PWD#/foo' foo: end #MAKE#[1]: Leaving directory '#PWD#/foo'\n", 0, 6); |