diff options
Diffstat (limited to 'src/engine/SCons/BuilderTests.py')
| -rw-r--r-- | src/engine/SCons/BuilderTests.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/engine/SCons/BuilderTests.py b/src/engine/SCons/BuilderTests.py index 2faaa2d..338d0b5 100644 --- a/src/engine/SCons/BuilderTests.py +++ b/src/engine/SCons/BuilderTests.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The SCons Foundation +# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/BuilderTests.py 4577 2009/12/27 19:44:43 scons" +__revision__ = "src/engine/SCons/BuilderTests.py 4629 2010/01/17 22:23:21 scons" # Define a null function for use as a builder action. # Where this is defined in the file seems to affect its @@ -691,13 +691,15 @@ class BuilderTestCase(unittest.TestCase): env['CNT'] = [0] tgt = builder(env, target=outfiles[0], source=infiles[0])[0] s = str(tgt) - assert s == test.workpath('0.out'), s + t = os.path.normcase(test.workpath('0.out')) + assert os.path.normcase(s) == t, s tgt.prepare() tgt.build() assert env['CNT'][0] == 1, env['CNT'][0] tgt = builder(env, outfiles[1], infiles[1])[0] s = str(tgt) - assert s == test.workpath('1.out'), s + t = os.path.normcase(test.workpath('1.out')) + assert os.path.normcase(s) == t, s tgt.prepare() tgt.build() assert env['CNT'][0] == 2 @@ -713,9 +715,10 @@ class BuilderTestCase(unittest.TestCase): # support anyway, don't bother trying to test for it. pass else: - s = str(tgts) - expect = str([test.workpath('2.out'), test.workpath('3.out')]) - assert s == expect, s + s = map(str, tgts) + expect = [test.workpath('2.out'), test.workpath('3.out')] + expect = map(os.path.normcase, expect) + assert map(os.path.normcase, s) == expect, s for t in tgts: t.prepare() tgts[0].build() tgts[1].build() |