48 lines
2.0 KiB
Diff
48 lines
2.0 KiB
Diff
diff -ur ../make-3.81.orig/tests/scripts/features/parallelism ./tests/scripts/features/parallelism
|
|
--- ../make-3.81.orig/tests/scripts/features/parallelism 2006-06-07 12:55:53.000000000 +0200
|
|
+++ ./tests/scripts/features/parallelism 2006-06-07 13:04:04.000000000 +0200
|
|
@@ -27,9 +27,9 @@
|
|
|
|
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 @@
|
|
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");
|
|
|
|
@@ -57,8 +57,8 @@
|
|
-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");
|
|
|
|
@@ -95,7 +95,7 @@
|
|
\@exit 1
|
|
|
|
ok:
|
|
- \@sleep 4
|
|
+ \@sleep 8
|
|
\@echo Ok done",
|
|
'-rR -j5', 'Fail
|
|
#MAKE#: *** [fail.1] Error 1
|