From 26bd9ecc22e7a7d954657b2389f7a2a704623e29 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Fri, 26 Sep 2008 04:42:05 +0000 Subject: 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. --- src/engine/SCons/Scanner/RCTests.py | 8 ++++---- 1 file 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', -- cgit v0.12