Changeset 1993 for trunk/src/kmk/tests/scripts/features

Timestamp:

Oct 29, 2008, 1:37:51 AM (17 years ago)

Author:

bird

Message:

Merged in current GNU Make code (CVS from 2008-10-28). Ref #55.

File:

• trunk/src/kmk/tests/scripts/features/parallelism (modified) (4 diffs)

trunk/src/kmk/tests/scripts/features/parallelism

@@ -70 +70 @@
 # for this situation and print a message if it occurred.  This test used
 # to trigger this code when I added it but no longer does after the fix.
+# We have to increase the timeout from the default (5s) on this test.
 
 run_make_test("
@@ -80 +81 @@
 
 first second: ; \@echo \$\@; $sleep_command 1; echo \$\@",
-              '-j2', "first\nfirst\nsecond\nsecond");
+              '-j2', "first\nfirst\nsecond\nsecond", 0, 7);
 
 # Michael Matz <matz@suse.de> reported a bug where if make is running in
@@ -108 +109 @@
 #MAKE#: *** [fail.1] Error 1
 The failing command:
-        @exit 1
+@exit 1
 #MAKE#: *** Waiting for unfinished jobs....
 Fail
 #MAKE#: *** [fail.2] Error 1
 The failing command:
-        @exit 1
+@exit 1
 Fail
 #MAKE#: *** [fail.3] Error 1
 The failing command:
-        @exit 1
+@exit 1
 Ok done',
              512);
@@ -138 +139 @@
         @exit 1
 ', '-j2', '');
+
+
+# TEST #9 -- Savannah bugs 3330 and 15919
+# In earlier versions of make this will either give the wrong answer, or hang.
+
+utouch(-10, 'target');
+run_make_test('target: intermed ; touch $@
+
+.INTERMEDIATE: intermed
+intermed: | phony ; touch $@
+
+.PHONY: phony
+phony: ; : phony', '-rR -j', ': phony');
+unlink('target');