diff options
| author | William Deegan <bill@baddogconsulting.com> | 2008-09-26 04:42:05 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2008-09-26 04:42:05 (GMT) |
| commit | 26bd9ecc22e7a7d954657b2389f7a2a704623e29 (patch) | |
| tree | fb42f3ec0412e481bf16e631aae29b987668dcc0 | |
| parent | cfd8f6a16b68336f33062625899d98427c511940 (diff) | |
| download | SCons-26bd9ecc22e7a7d954657b2389f7a2a704623e29.zip SCons-26bd9ecc22e7a7d954657b2389f7a2a704623e29.tar.gz SCons-26bd9ecc22e7a7d954657b2389f7a2a704623e29.tar.bz2 | |
Fixed an issue with the way the test was setting up the CPPPATH.
Was causing buildbot failure on centos5 buildbot.
Turns out some weird interaction with the bogus code which is replaced
below was only happening when setuptools was installed
in the python tree being used for tests.
| -rw-r--r-- | src/engine/SCons/Scanner/RCTests.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/SCons/Scanner/RCTests.py b/src/engine/SCons/Scanner/RCTests.py index c7ac3e4..41954f1 100644 --- a/src/engine/SCons/Scanner/RCTests.py +++ b/src/engine/SCons/Scanner/RCTests.py @@ -122,20 +122,20 @@ def deps_match(self, deps, headers): class RCScannerTestCase1(unittest.TestCase): def runTest(self): + path = [] env = DummyEnvironment(RCSUFFIXES=['.rc','.rc2'], - CPPPATH=sys.path) + CPPPATH=path) s = SCons.Scanner.RC.RCScan() - path = s.path(env) deps = s(env.File('t1.rc'), env, path) headers = ['t1.h'] deps_match(self, deps, headers) class RCScannerTestCase2(unittest.TestCase): def runTest(self): + path = [] env = DummyEnvironment(RCSUFFIXES=['.rc','.rc2'], - CPPPATH=sys.path) + CPPPATH=path) s = SCons.Scanner.RC.RCScan() - path = s.path(env) deps = s(env.File('t2.rc'), env, path) headers = ['MSG00410.bin', 'abc.ico','bullseye.cur', |