diff options
| author | Steven Knight <knight@baldmt.com> | 2004-04-07 22:58:22 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-04-07 22:58:22 (GMT) |
| commit | a15b5eccc7ab09804775ac47d0e903620ca6002f (patch) | |
| tree | 4848983354e94e8edb68331487af4eede8df5139 /src/engine | |
| parent | d21d3d896c0b48d1b0db26cb91d568b07c113377 (diff) | |
| download | SCons-a15b5eccc7ab09804775ac47d0e903620ca6002f.zip SCons-a15b5eccc7ab09804775ac47d0e903620ca6002f.tar.gz SCons-a15b5eccc7ab09804775ac47d0e903620ca6002f.tar.bz2 | |
Have Task.make_ready() create a list of the out-of-date Nodes.
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Taskmaster.py | 25 | ||||
| -rw-r--r-- | src/engine/SCons/TaskmasterTests.py | 44 |
2 files changed, 61 insertions, 8 deletions
diff --git a/src/engine/SCons/Taskmaster.py b/src/engine/SCons/Taskmaster.py index 8afd847..ffdc065 100644 --- a/src/engine/SCons/Taskmaster.py +++ b/src/engine/SCons/Taskmaster.py @@ -169,17 +169,26 @@ class Task: def make_ready(self): """Make a task ready for execution.""" - state = SCons.Node.up_to_date + self.out_of_date = [] calc = self.tm.calc - for t in self.targets: - c = calc or t.calculator() - if not t.current(c): - state = SCons.Node.executing - for t in self.targets: - if state == SCons.Node.executing: + if calc: + for t in self.targets: + if not t.current(calc): + self.out_of_date.append(t) + else: + for t in self.targets: + if not t.current(t.calculator()): + self.out_of_date.append(t) + if self.out_of_date: + state = SCons.Node.executing + for t in self.targets: for side_effect in t.side_effects: side_effect.set_state(state) - t.set_state(state) + t.set_state(state) + else: + state = SCons.Node.up_to_date + for t in self.targets: + t.set_state(state) def postprocess(self): """Post process a task after it's been executed.""" diff --git a/src/engine/SCons/TaskmasterTests.py b/src/engine/SCons/TaskmasterTests.py index d20b805..1f66e06 100644 --- a/src/engine/SCons/TaskmasterTests.py +++ b/src/engine/SCons/TaskmasterTests.py @@ -23,6 +23,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" +import copy import sys import unittest @@ -409,6 +410,49 @@ class TaskmasterTestCase(unittest.TestCase): t.executed() + def test_make_ready_out_of_date(self): + """Test the Task.make_ready() method's list of out-of-date Nodes + """ + class MyCalc(SCons.Taskmaster.Calc): + def current(self, node, sig): + n = str(node) + return n[0] == 'c' + + ood = [] + def TaskGen(tm, targets, top, node, ood=ood): + class MyTask(SCons.Taskmaster.Task): + def make_ready(self): + SCons.Taskmaster.Task.make_ready(self) + self.ood.extend(self.out_of_date) + t = MyTask(tm, targets, top, node) + t.ood = ood + return t + + n1 = Node("n1") + c2 = Node("c2") + n3 = Node("n3") + c4 = Node("c4") + tm = SCons.Taskmaster.Taskmaster(targets = [n1, c2, n3, c4], + tasker = TaskGen, + calc = MyCalc()) + + del ood[:] + t = tm.next_task() + assert ood == [n1], ood + + del ood[:] + t = tm.next_task() + assert ood == [], ood + + del ood[:] + t = tm.next_task() + assert ood == [n3], ood + + del ood[:] + t = tm.next_task() + assert ood == [], ood + + def test_make_ready_exception(self): """Test handling exceptions from Task.make_ready() """ |