diff options
| author | Steven Knight <knight@baldmt.com> | 2002-03-16 10:18:24 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2002-03-16 10:18:24 (GMT) |
| commit | 1d0c4df93b2120fe494da4a2e1f40b20fe0245be (patch) | |
| tree | fc3d2b76966e2cd526918a2960b6892460b5c50b /src/engine/SCons/Scanner/ProgTests.py | |
| parent | 0bfa6712f6b0ba40f7df806ec35a40fa056f026f (diff) | |
| download | SCons-1d0c4df93b2120fe494da4a2e1f40b20fe0245be.zip SCons-1d0c4df93b2120fe494da4a2e1f40b20fe0245be.tar.gz SCons-1d0c4df93b2120fe494da4a2e1f40b20fe0245be.tar.bz2 | |
Turn the Prog Scanner into a prototype pattern that looks up LIBPATH Nodes (the way the C Scanner does CPPPATH).
Diffstat (limited to 'src/engine/SCons/Scanner/ProgTests.py')
| -rw-r--r-- | src/engine/SCons/Scanner/ProgTests.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/SCons/Scanner/ProgTests.py b/src/engine/SCons/Scanner/ProgTests.py index 3f79838..b59e554 100644 --- a/src/engine/SCons/Scanner/ProgTests.py +++ b/src/engine/SCons/Scanner/ProgTests.py @@ -70,7 +70,7 @@ class ProgScanTestCase1(unittest.TestCase): env = DummyEnvironment(LIBPATH=[ test.workpath("") ], LIBS=[ 'l1', 'l2', 'l3' ]) s = SCons.Scanner.Prog.ProgScan() - deps = s.scan('dummy', env) + deps = s.instance(env).scan('dummy', env) assert deps_match(deps, ['l1.lib']), map(str, deps) class ProgScanTestCase2(unittest.TestCase): @@ -79,7 +79,7 @@ class ProgScanTestCase2(unittest.TestCase): ["", "d1", "d1/d2" ]), LIBS=[ 'l1', 'l2', 'l3' ]) s = SCons.Scanner.Prog.ProgScan() - deps = s.scan('dummy', env) + deps = s.instance(env).scan('dummy', env) assert deps_match(deps, ['l1.lib', 'd1/l2.lib', 'd1/d2/l3.lib' ]), map(str, deps) class ProgScanTestCase3(unittest.TestCase): @@ -88,7 +88,7 @@ class ProgScanTestCase3(unittest.TestCase): test.workpath("d1"), LIBS='l2 l3') s = SCons.Scanner.Prog.ProgScan() - deps = s.scan('dummy', env) + deps = s.instance(env).scan('dummy', env) assert deps_match(deps, ['d1/l2.lib', 'd1/d2/l3.lib']), map(str, deps) def suite(): @@ -104,7 +104,7 @@ def suite(): test.workpath("d1"), LIBS=u'l2 l3') s = SCons.Scanner.Prog.ProgScan() - deps = s.scan('dummy', env) + deps = s.instance(env).scan('dummy', env) assert deps_match(deps, ['d1/l2.lib', 'd1/d2/l3.lib']), map(str, deps) suite.addTest(ProgScanTestCase4()) \n""" |