diff options
Diffstat (limited to 'tests/scripts/features/parallelism')
| -rw-r--r-- | tests/scripts/features/parallelism | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/tests/scripts/features/parallelism b/tests/scripts/features/parallelism index c702c26..4097489 100644 --- a/tests/scripts/features/parallelism +++ b/tests/scripts/features/parallelism @@ -27,9 +27,9 @@ else { run_make_test(" all : def_1 def_2 def_3 -def_1 : ; \@echo ONE; $sleep_command 3 ; echo TWO -def_2 : ; \@$sleep_command 2 ; echo THREE -def_3 : ; \@$sleep_command 1 ; echo FOUR", +def_1 : ; \@echo ONE; $sleep_command 12 ; echo TWO +def_2 : ; \@$sleep_command 8 ; echo THREE +def_3 : ; \@$sleep_command 4 ; echo FOUR", '-j4', "ONE\nFOUR\nTHREE\nTWO"); # Test parallelism with included files. Here we sleep/echo while @@ -38,8 +38,8 @@ def_3 : ; \@$sleep_command 1 ; echo FOUR", run_make_test(" all: 1 2; \@echo success -include 1.inc 2.inc -1.inc: ; \@echo ONE.inc; $sleep_command 2; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 2; echo TWO' > \$\@ -2.inc: ; \@$sleep_command 1; echo THREE.inc; echo '2: ; \@$sleep_command 1; echo THREE' > \$\@", +1.inc: ; \@echo ONE.inc; $sleep_command 8; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 8; echo TWO' > \$\@ +2.inc: ; \@$sleep_command 4; echo THREE.inc; echo '2: ; \@$sleep_command 4; echo THREE' > \$\@", "-j4", "ONE.inc\nTHREE.inc\nTWO.inc\nONE\nTHREE\nTWO\nsuccess\n", 0, 7); @@ -57,8 +57,8 @@ ifeq (\$(INC),yes) -include 1.inc 2.inc endif -1.inc: ; \@echo ONE.inc; $sleep_command 2; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 2; echo TWO' > \$\@ -2.inc: ; \@$sleep_command 1; echo THREE.inc; echo '2: ; \@$sleep_command 1; echo THREE' > \$\@", +1.inc: ; \@echo ONE.inc; $sleep_command 8; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 8; echo TWO' > \$\@ +2.inc: ; \@$sleep_command 4; echo THREE.inc; echo '2: ; \@$sleep_command 4; echo THREE' > \$\@", "-j4", "ONE.inc\nTHREE.inc\nTWO.inc\nONE\nTHREE\nTWO\nsuccess\n", 0, 7); @@ -74,40 +74,40 @@ rmfiles(qw(1.inc 2.inc)); run_make_test(" export HI = \$(shell \$(\$\@.CMD)) first.CMD = echo hi -second.CMD = $sleep_command 4; echo hi +second.CMD = $sleep_command 16; echo hi .PHONY: all first second all: first second -first second: ; \@echo \$\@; $sleep_command 1; echo \$\@", - '-j2', "first\nfirst\nsecond\nsecond", 0, 7); +first second: ; \@echo \$\@; $sleep_command 4; echo \$\@", + '-j2', "first\nfirst\nsecond\nsecond", 0, 28); # Michael Matz <matz@suse.de> reported a bug where if make is running in # parallel without -k and two jobs die in a row, but not too close to each # other, then make will quit without waiting for the rest of the jobs to die. run_make_test(" -.PHONY: all fail.1 fail.2 fail.3 ok -all: fail.1 ok fail.2 fail.3 +.PHONY: all fail.3 fail.6 fail.9 ok +all: fail.3 ok fail.6 fail.9 -fail.1 fail.2 fail.3: +fail.3 fail.6 fail.9: \@$sleep_command \$(patsubst fail.%,%,\$\@) \@echo Fail \@exit 1 ok: - \@$sleep_command 4 + \@$sleep_command 12 \@echo Ok done", '-rR -j5', "Fail #MAKEFILE#:6: recipe for target 'fail.1' failed -#MAKE#: *** [fail.1] Error 1 +#MAKE#: *** [fail.3] Error 1 #MAKE#: *** Waiting for unfinished jobs.... Fail #MAKEFILE#:6: recipe for target 'fail.2' failed -#MAKE#: *** [fail.2] Error 1 +#MAKE#: *** [fail.6] Error 1 Fail #MAKEFILE#:6: recipe for target 'fail.3' failed -#MAKE#: *** [fail.3] Error 1 +#MAKE#: *** [fail.9] Error 1 Ok done", 512); |