From 5e746bc5bde2a977942992f645fa4cbbc6adb28d Mon Sep 17 00:00:00 2001 From: bdbaddog Date: Fri, 26 Sep 2008 04:42:05 +0000 Subject: [PATCH] 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. git-svn-id: http://scons.tigris.org/svn/scons/trunk@3481 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- 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 c7ac3e47..41954f13 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', -- 2.26.2