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 /bin/scons-test.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 'bin/scons-test.py')
| -rw-r--r-- | bin/scons-test.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bin/scons-test.py b/bin/scons-test.py index aa03d72..8d1950f 100644 --- a/bin/scons-test.py +++ b/bin/scons-test.py @@ -19,7 +19,6 @@ import getopt import imp import os import os.path -import string import sys import tempfile import time @@ -90,7 +89,7 @@ def outname(n, outdir=outdir): l.append(tail) l.append(outdir) l.reverse() - return apply(os.path.join, l) + return os.path.join(*l) for name in zf.namelist(): dest = outname(name) @@ -135,7 +134,7 @@ fp.close() if not args: runtest_args = '-a' else: - runtest_args = string.join(args) + runtest_args = ' '.join(args) if format == '--xml': |