From 1d298acf9d01e0812e0efb9709439e5c0b8b509c Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Sat, 12 Jan 2013 21:54:41 -0500 Subject: Ensure parallel test works properly. --- tests/scripts/features/parallelism | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/scripts/features/parallelism b/tests/scripts/features/parallelism index 08c822e..a895517 100644 --- a/tests/scripts/features/parallelism +++ b/tests/scripts/features/parallelism @@ -91,12 +91,12 @@ run_make_test(" all: fail.1 ok fail.2 fail.3 fail.1 fail.2 fail.3: - \@sleep \$(patsubst fail.%,%,\$\@) + \@$sleep_command \$(patsubst fail.%,%,\$\@) \@echo Fail \@exit 1 ok: - \@sleep 4 + \@$sleep_command 4 \@echo Ok done", '-rR -j5', "Fail #MAKEFILE#:6: recipe for target 'fail.1' failed @@ -175,11 +175,12 @@ $extraENV{MAKEFLAGS} = '-j4'; run_make_test(q! things = thing1 thing2 all: $(things) -$(things):; @echo '$@ start'; sleep 1; echo '$@ end' +thing1:; @sleep 1; echo '$@ start'; sleep 2; echo '$@ end' +thing2:; @echo '$@ start'; sleep 2; echo '$@ end' -include inc.mk inc.mk: ; @touch $@ !, - '', "thing1 start\nthing2 start\nthing1 end\nthing2 end\n"); + '', "thing2 start\nthing1 start\nthing2 end\nthing1 end\n"); delete $extraENV{MAKEFLAGS}; rmfiles('inc.mk'); -- cgit v1.2.3