diff options
| author | Greg Noel <GregNoel@tigris.org> | 2010-03-25 04:14:28 (GMT) |
|---|---|---|
| committer | Greg Noel <GregNoel@tigris.org> | 2010-03-25 04:14:28 (GMT) |
| commit | 22d352500f1cd6bd0c53d788a5dc44a1fefa676e (patch) | |
| tree | 0984fd581082c27cfbfbb7f94d5751b0e6fd2741 /test/WhereIs.py | |
| parent | 75ac32ac8e32076e25b72a19eb56340cc585fa4e (diff) | |
| download | SCons-22d352500f1cd6bd0c53d788a5dc44a1fefa676e.zip SCons-22d352500f1cd6bd0c53d788a5dc44a1fefa676e.tar.gz SCons-22d352500f1cd6bd0c53d788a5dc44a1fefa676e.tar.bz2 | |
Move 2.0 changes collected in branches/pending back to trunk for further
development. Note that this set of changes is NOT backward-compatible;
the trunk no longer works with Python 1.5.2, 2.0, or 2.1.
Diffstat (limited to 'test/WhereIs.py')
| -rw-r--r-- | test/WhereIs.py | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/test/WhereIs.py b/test/WhereIs.py index 7a93af4..dc127b6 100644 --- a/test/WhereIs.py +++ b/test/WhereIs.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import string import sys import TestSCons @@ -57,13 +56,13 @@ pathdirs_1234 = [ test.workpath('sub1'), test.workpath('sub2'), test.workpath('sub3'), test.workpath('sub4'), - ] + string.split(env_path, os.pathsep) + ] + env_path.split(os.pathsep) pathdirs_1243 = [ test.workpath('sub1'), test.workpath('sub2'), test.workpath('sub4'), test.workpath('sub3'), - ] + string.split(env_path, os.pathsep) + ] + env_path.split(os.pathsep) test.write('SConstruct', """ SConscript('%s') @@ -77,13 +76,13 @@ print WhereIs('xxx.exe', %s, reject=%s) env.Replace( XXXNAME='xxx.exe' ) print env.WhereIs( '$XXXNAME', %s ) """ % (subdir_SConscript, - repr(string.join(pathdirs_1234, os.pathsep)), - repr(string.join(pathdirs_1243, os.pathsep)), + repr(os.pathsep.join(pathdirs_1234)), + repr(os.pathsep.join(pathdirs_1243)), repr(pathdirs_1234), repr(pathdirs_1243), repr(pathdirs_1243), repr(sub4_xxx_exe), - repr(string.join(pathdirs_1243, os.pathsep)), + repr(os.pathsep.join(pathdirs_1243)), )) test.write(subdir_SConscript, """ @@ -93,13 +92,13 @@ print WhereIs('xxx.exe', %s) print env.WhereIs('xxx.exe', %s) print WhereIs('xxx.exe', %s) print WhereIs('xxx.exe', %s) -""" % (repr(string.join(pathdirs_1234, os.pathsep)), - repr(string.join(pathdirs_1243, os.pathsep)), +""" % (repr(os.pathsep.join(pathdirs_1234)), + repr(os.pathsep.join(pathdirs_1243)), repr(pathdirs_1234), repr(pathdirs_1243), )) -os.environ['PATH'] = string.join(pathdirs_1234, os.pathsep) +os.environ['PATH'] = os.pathsep.join(pathdirs_1234) expect = [ test.workpath(sub3_xxx_exe), test.workpath(sub3_xxx_exe), @@ -116,10 +115,10 @@ expect = [ test.workpath(sub3_xxx_exe), ] test.run(arguments = ".", - stdout = test.wrap_stdout(read_str = string.join(expect, "\n") + "\n", + stdout = test.wrap_stdout(read_str = "\n".join(expect) + "\n", build_str = "scons: `.' is up to date.\n")) -os.environ['PATH'] = string.join(pathdirs_1243, os.pathsep) +os.environ['PATH'] = os.pathsep.join(pathdirs_1243) expect = [ test.workpath(sub4_xxx_exe), test.workpath(sub3_xxx_exe), @@ -136,7 +135,7 @@ expect = [ test.workpath(sub4_xxx_exe), ] test.run(arguments = ".", - stdout = test.wrap_stdout(read_str = string.join(expect, "\n") + "\n", + stdout = test.wrap_stdout(read_str = "\n".join(expect) + "\n", build_str = "scons: `.' is up to date.\n")) |