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

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.

Location:

trunk/src/kmk/tests/scripts/targets

Files:

• INTERMEDIATE (modified) (2 diffs)
• SECONDARY (modified) (1 diff)

trunk/src/kmk/tests/scripts/targets/INTERMEDIATE

@@ -57 +57 @@
 # TEST #3
 # kmk+fast: differs because of different hashing.
+# kmk: suspect the -j1 actually hides a bug, 'cp bar.f bar.e' is executed twice.
 
-&run_make_with_options($makefile,'foo.c',&get_logfile);
+&run_make_with_options($makefile,'-j1 foo.c',&get_logfile);
 $answer = "cp foo.f foo.e\ncp bar.f bar.e\ncat foo.e bar.e > foo.c\n"
         . (!$is_kmk && !$is_fast ? "rm bar.e foo.e\n" : "rm foo.e bar.e\n");
@@ -71 +72 @@
 # TEST #5
 # kmk+fast: differs because of different hashing.
+# kmk: suspect the -j1 actually hides a bug, 'cp bar.f bar.e' is executed twice.
 
 &utouch(-10, 'foo.c');
 &touch('foo.f');
 
-&run_make_with_options($makefile,'foo.c',&get_logfile);
+&run_make_with_options($makefile,'-j1 foo.c',&get_logfile);
 $answer = "cp foo.f foo.e\ncp bar.f bar.e\ncat foo.e bar.e > foo.c\n"
         . (!$is_kmk && !$is_fast ? "rm bar.e foo.e\n" : "rm foo.e bar.e\n");

trunk/src/kmk/tests/scripts/targets/SECONDARY

@@ -122 +122 @@
 unlink('version2');
 
+# TEST #9 -- Savannah bug #15919
+# The original fix for this bug caused a new bug, shown here.
+# kmk: suspect the -j1 actually hides a bug, 'cp 2.a 2.b' is executed twice.
+
+touch(qw(1.a 2.a));
+
+run_make_test('
+%.c : %.b ; cp $< $@
+%.b : %.a ; cp $< $@
+all : 1.c 2.c', '-rR -j',
+'cp 1.a 1.b
+cp 2.a 2.b
+cp 1.b 1.c
+cp 2.b 2.c
+rm 1.b 2.b');
+
+unlink(qw(1.a 2.a 1.c 2.c));
+
+# TEST #10 -- Savannah bug #15919
+touch('test.0');
+run_make_test('
+.SECONDARY : test.1 test.2 test.3
+
+test : test.4
+
+%.4 : %.int %.3 ; touch $@
+
+%.int : %.3 %.2 ; touch $@
+
+%.3 : | %.2 ; touch $@
+
+%.2 : %.1 ; touch $@
+
+%.1 : %.0 ; touch $@', '-rR -j 2',
+'touch test.1
+touch test.2
+touch test.3
+touch test.int
+touch test.4
+rm test.int');
+
+# After a touch of test.0 it should give the same output, except we don't need
+# to rebuild test.3 (order-only)
+sleep(1);
+touch('test.0');
+run_make_test(undef, '-rR -j 2',
+'touch test.1
+touch test.2
+touch test.int
+touch test.4
+rm test.int');
+
+# With both test.0 and test.3 updated it should still build everything except
+# test.3
+sleep(1);
+touch('test.0', 'test.3');
+run_make_test(undef, '-rR -j 2',
+'touch test.1
+touch test.2
+touch test.int
+touch test.4
+rm test.int');
+
+unlink(qw(test.0 test.1 test.2 test.3 test.4));
+
 # This tells the test driver that the perl test script executed properly.
 1;