summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Node/NodeTests.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2003-07-20 16:07:00 (GMT)
committerSteven Knight <knight@baldmt.com>2003-07-20 16:07:00 (GMT)
commit67a5558f919e9504d0c8c564d72458cd32fac906 (patch)
tree59a4348684b7debc833101ced37f3e3b84008c8b /src/engine/SCons/Node/NodeTests.py
parent819abe6e6861c13d8baa5dd964849654def5fe74 (diff)
downloadSCons-67a5558f919e9504d0c8c564d72458cd32fac906.zip
SCons-67a5558f919e9504d0c8c564d72458cd32fac906.tar.gz
SCons-67a5558f919e9504d0c8c564d72458cd32fac906.tar.bz2
Speed up adding children to the various Node lists (depends, ignore, sources, implicit).
Diffstat (limited to 'src/engine/SCons/Node/NodeTests.py')
-rw-r--r--src/engine/SCons/Node/NodeTests.py34
1 files changed, 22 insertions, 12 deletions
diff --git a/src/engine/SCons/Node/NodeTests.py b/src/engine/SCons/Node/NodeTests.py
index f8593d7..103cfae 100644
--- a/src/engine/SCons/Node/NodeTests.py
+++ b/src/engine/SCons/Node/NodeTests.py
@@ -429,20 +429,23 @@ class NodeTestCase(unittest.TestCase):
n1 = SCons.Node.Node()
n1.builder_set(Builder())
node.implicit = []
- node._add_child(node.implicit, [n1])
+ node.implicit_dict = {}
+ node._add_child(node.implicit, node.implicit_dict, [n1])
node.prepare() # should not throw an exception
n2 = SCons.Node.Node()
n2.linked = 1
node.implicit = []
- node._add_child(node.implicit, [n2])
+ node.implicit_dict = {}
+ node._add_child(node.implicit, node.implicit_dict, [n2])
node.prepare() # should not throw an exception
n3 = SCons.Node.Node()
node.implicit = []
- node._add_child(node.implicit, [n3])
+ node.implicit_dict = {}
+ node._add_child(node.implicit, node.implicit_dict, [n3])
node.prepare() # should not throw an exception
@@ -451,7 +454,8 @@ class NodeTestCase(unittest.TestCase):
return None
n4 = MyNode()
node.implicit = []
- node._add_child(node.implicit, [n4])
+ node.implicit_dict = {}
+ node._add_child(node.implicit, node.implicit_dict, [n4])
exc_caught = 0
try:
node.prepare()
@@ -650,8 +654,9 @@ class NodeTestCase(unittest.TestCase):
node.add_source([n1, n2, n3])
node.add_dependency([n4, n5, n6])
node.implicit = []
- node._add_child(node.implicit, [n7, n8, n9])
- node._add_child(node.implicit, [n10, n11, n12])
+ node.implicit_dict = {}
+ node._add_child(node.implicit, node.implicit_dict, [n7, n8, n9])
+ node._add_child(node.implicit, node.implicit_dict, [n10, n11, n12])
node.add_ignore([n2, n5, n8, n11])
kids = node.children()
@@ -680,8 +685,9 @@ class NodeTestCase(unittest.TestCase):
node.add_source([n1, n2, n3])
node.add_dependency([n4, n5, n6])
node.implicit = []
- node._add_child(node.implicit, [n7, n8, n9])
- node._add_child(node.implicit, [n10, n11, n12])
+ node.implicit_dict = {}
+ node._add_child(node.implicit, node.implicit_dict, [n7, n8, n9])
+ node._add_child(node.implicit, node.implicit_dict, [n10, n11, n12])
node.add_ignore([n2, n5, n8, n11])
kids = node.all_children()
@@ -717,10 +723,14 @@ class NodeTestCase(unittest.TestCase):
n1.add_source([n2, n3])
nw = SCons.Node.Walker(n1)
- assert nw.next().name == "n2"
- assert nw.next().name == "n3"
- assert nw.next().name == "n1"
- assert nw.next() == None
+ n = nw.next()
+ assert n.name == "n2", n.name
+ n = nw.next()
+ assert n.name == "n3", n.name
+ n = nw.next()
+ assert n.name == "n1", n.name
+ n = nw.next()
+ assert n == None, n
n4 = MyNode("n4")
n5 = MyNode("n5")