diff options
| author | Steven Knight <knight@baldmt.com> | 2002-06-11 22:19:47 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2002-06-11 22:19:47 (GMT) |
| commit | d1b81f58263a824ca39ecc179f61ad541c5a0f7a (patch) | |
| tree | b4e55595b7253b73970bcb4b2b1e1cc1eeaeee8f /src/engine/SCons/Scanner | |
| parent | 9298969ebb3bfbb7c2c27b6f3352b26113361faf (diff) | |
| download | SCons-d1b81f58263a824ca39ecc179f61ad541c5a0f7a.zip SCons-d1b81f58263a824ca39ecc179f61ad541c5a0f7a.tar.gz SCons-d1b81f58263a824ca39ecc179f61ad541c5a0f7a.tar.bz2 | |
Remove white-space split of file name lists.
Diffstat (limited to 'src/engine/SCons/Scanner')
| -rw-r--r-- | src/engine/SCons/Scanner/ProgTests.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/engine/SCons/Scanner/ProgTests.py b/src/engine/SCons/Scanner/ProgTests.py index 75ce697..4e60ccf 100644 --- a/src/engine/SCons/Scanner/ProgTests.py +++ b/src/engine/SCons/Scanner/ProgTests.py @@ -24,6 +24,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os.path +import string import sys import types import unittest @@ -99,9 +100,9 @@ class ProgScanTestCase2(unittest.TestCase): class ProgScanTestCase3(unittest.TestCase): def runTest(self): - env = DummyEnvironment(LIBPATH=test.workpath("d1/d2") + ' ' +\ - test.workpath("d1"), - LIBS='l2 l3') + env = DummyEnvironment(LIBPATH=[test.workpath("d1/d2"), + test.workpath("d1")], + LIBS=string.split('l2 l3')) s = SCons.Scanner.Prog.ProgScan() deps = s.scan('dummy', env, DummyTarget()) assert deps_match(deps, ['d1/l2.lib', 'd1/d2/l3.lib']), map(str, deps) @@ -115,9 +116,9 @@ def suite(): code = """if 1: class ProgScanTestCase4(unittest.TestCase): def runTest(self): - env = DummyEnvironment(LIBPATH=test.workpath("d1/d2") + ' ' +\ - test.workpath("d1"), - LIBS=u'l2 l3') + env = DummyEnvironment(LIBPATH=[test.workpath("d1/d2"), + test.workpath("d1")], + LIBS=string.split(u'l2 l3')) s = SCons.Scanner.Prog.ProgScan() deps = s.scan('dummy', env, DummyTarget()) assert deps_match(deps, ['d1/l2.lib', 'd1/d2/l3.lib']), map(str, deps) |