summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Node/FSTests.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2001-12-13 04:42:05 (GMT)
committerSteven Knight <knight@baldmt.com>2001-12-13 04:42:05 (GMT)
commitc81b4be9b7a06dc41cc1f425887d4600fa47f0bc (patch)
treea800b193675c98825b6af007b88b1fb51c41c3e4 /src/engine/SCons/Node/FSTests.py
parentb9f370f232001d693f10279a3bcff8a0e66eb303 (diff)
downloadSCons-c81b4be9b7a06dc41cc1f425887d4600fa47f0bc.zip
SCons-c81b4be9b7a06dc41cc1f425887d4600fa47f0bc.tar.gz
SCons-c81b4be9b7a06dc41cc1f425887d4600fa47f0bc.tar.bz2
Bug fixes for Scanner handling of subdirectories and Environment copying, courtesy Charles Crain.
Diffstat (limited to 'src/engine/SCons/Node/FSTests.py')
-rw-r--r--src/engine/SCons/Node/FSTests.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py
index aecbfb4..523f96b 100644
--- a/src/engine/SCons/Node/FSTests.py
+++ b/src/engine/SCons/Node/FSTests.py
@@ -301,15 +301,16 @@ class FSTestCase(unittest.TestCase):
match(e13.path, "subdir/subdir/e13")
# Test scanning
- f1.scanner = Scanner()
+ scn = Scanner()
+ f1.scanners = [ scn ]
f1.scan()
- assert f1.implicit[f1.scanner][0].path_ == os.path.join("d1", "f1")
- del f1.implicit[f1.scanner]
+ assert f1.implicit[scn][0].path_ == os.path.join("d1", "f1")
+ del f1.implicit[scn]
f1.scan()
assert len(f1.implicit) == 0, f1.implicit
- del f1.scanned[f1.scanner]
+ del f1.scanned[scn]
f1.scan()
- assert f1.implicit[f1.scanner][0].path_ == os.path.join("d1", "f1")
+ assert f1.implicit[scn][0].path_ == os.path.join("d1", "f1")
# Test building a file whose directory is not there yet...
f1 = fs.File(test.workpath("foo/bar/baz/ack"))