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/AS/as-live.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/AS/as-live.py')
| -rw-r--r-- | test/AS/as-live.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/test/AS/as-live.py b/test/AS/as-live.py index 0ee7c16..0f7ec38 100644 --- a/test/AS/as-live.py +++ b/test/AS/as-live.py @@ -28,7 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Verify correct use of the live 'as' assembler. """ -import string import sys import TestSCons @@ -43,7 +42,7 @@ test = TestSCons.TestSCons() if not test.detect('AS', 'as'): test.skip_test("as not found; skipping test\n") -x86 = (sys.platform == 'win32' or string.find(sys.platform, 'linux') != -1) +x86 = (sys.platform == 'win32' or sys.platform.find('linux') != -1) if not x86: test.skip_test("skipping as test on non-x86 platform '%s'\n" % sys.platform) @@ -52,12 +51,11 @@ if not x86: test.write("wrapper.py", """\ import os -import string import sys open('%s', 'wb').write("wrapper.py: %%s\\n" %% sys.argv[-1]) -cmd = string.join(sys.argv[1:]) +cmd = " ".join(sys.argv[1:]) os.system(cmd) -""" % string.replace(test.workpath('wrapper.out'), '\\', '\\\\')) +""" % test.workpath('wrapper.out').replace('\\', '\\\\')) test.write('SConstruct', """\ aaa = Environment() |