Changeset 1994 in kBuild for trunk/src

Timestamp:

Oct 29, 2008 3:20:22 AM (17 years ago)

Author:

bird

Message:

remake.c: fixed regression from GNU Make head, see Savannah bug #15919.

Location:

trunk/src/kmk

Files:

• remake.c (modified) (1 diff)
• tests/scripts/targets/INTERMEDIATE (modified) (2 diffs)
• tests/scripts/targets/SECONDARY (modified) (1 diff)

trunk/src/kmk/remake.c

@@ -1169 +1169 @@
           /* Reset this target's state so that we check it fresh.  It could be
              that it's already been checked as part of an order-only
-             prerequisite and so wasn't rebuilt then, but should be now.  */
-          set_command_state (file, cs_not_started);
+             prerequisite and so wasn't rebuilt then, but should be now.
+
+             bird: What if we're already running the recipe?  We don't wish
+                   it to be started once again do we?  This happens with the
+                   SECONDARY Test #9 here now... If the idea is to re-evaluate
+                   the target regardless of whether it's running or no, then
+                   perhaps saving and restoring is a better idea?
+                   See bug #15919.  */
+          if (file->command_state != cs_running) /* bird */
+            set_command_state (file, cs_not_started);
 
           lastd = 0;

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,'-j1 foo.c',&get_logfile);
+&run_make_with_options($makefile,'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");
@@ -72 +71 @@
 # 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,'-j1 foo.c',&get_logfile);
+&run_make_with_options($makefile,'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

@@ -124 +124 @@
 # 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));