diff options
| author | Steven Knight <knight@baldmt.com> | 2002-10-04 22:04:27 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2002-10-04 22:04:27 (GMT) |
| commit | bdf39335f8eff310c749fa5a9d08697aa81a003b (patch) | |
| tree | 21343a3f090e72f244b310a2827f87789ffdaab0 /src/engine/SCons | |
| parent | 313be3374d81ff22c10b8ec09c465cabd835062f (diff) | |
| download | SCons-bdf39335f8eff310c749fa5a9d08697aa81a003b.zip SCons-bdf39335f8eff310c749fa5a9d08697aa81a003b.tar.gz SCons-bdf39335f8eff310c749fa5a9d08697aa81a003b.tar.bz2 | |
win32 test portability fixes (Anthony Roach)
Diffstat (limited to 'src/engine/SCons')
| -rw-r--r-- | src/engine/SCons/UtilTests.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/engine/SCons/UtilTests.py b/src/engine/SCons/UtilTests.py index cad5670..628de30 100644 --- a/src/engine/SCons/UtilTests.py +++ b/src/engine/SCons/UtilTests.py @@ -58,7 +58,6 @@ class UtilTestCase(unittest.TestCase): def cvt(str): return string.replace(str, '/', os.sep) - newcom = scons_subst("test $TARGETS $SOURCES", loc, {}) assert newcom == cvt("test foo/bar.exe /bar/baz.obj ../foo/baz.obj foo/blah.cpp /bar/ack.cpp ../foo/ack.c") @@ -90,15 +89,15 @@ class UtilTestCase(unittest.TestCase): assert newcom == cvt("test foo") newcom = scons_subst("test ${TARGET.abspath}", loc, {}) - assert newcom == cvt("test %s/foo/bar.exe"%os.getcwd()), newcom + assert newcom == cvt("test %s/foo/bar.exe"%SCons.Util.updrive(os.getcwd())), newcom newcom = scons_subst("test ${SOURCES.abspath}", loc, {}) - assert newcom == cvt("test %s/foo/blah.cpp %s %s/foo/ack.c"%(os.getcwd(), - os.path.abspath(os.path.normpath("/bar/ack.cpp")), - os.path.normpath(os.getcwd()+"/.."))), newcom + assert newcom == cvt("test %s/foo/blah.cpp %s %s/foo/ack.c"%(SCons.Util.updrive(os.getcwd()), + SCons.Util.updrive(os.path.abspath(os.path.normpath("/bar/ack.cpp"))), + SCons.Util.updrive(os.path.normpath(os.getcwd()+"/..")))), newcom newcom = scons_subst("test ${SOURCE.abspath}", loc, {}) - assert newcom == cvt("test %s/foo/blah.cpp"%os.getcwd()), newcom + assert newcom == cvt("test %s/foo/blah.cpp"%SCons.Util.updrive(os.getcwd())), newcom newcom = scons_subst("test $xxx", loc, {}) assert newcom == cvt("test"), newcom |