summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2013-01-12 21:54:41 -0500
committerPaul Smith <psmith@gnu.org>2013-01-12 21:54:41 -0500
commit1d298acf9d01e0812e0efb9709439e5c0b8b509c (patch)
tree4be5db0afb2e1584ef8a2721609210211964cecc
parent5a5a1aff6aeff6df69ecda81b40deebed89b718a (diff)
downloadgunmake-1d298acf9d01e0812e0efb9709439e5c0b8b509c.tar.gz
Ensure parallel test works properly.
-rw-r--r--tests/scripts/features/parallelism9
1 files changed, 5 insertions, 4 deletions
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');