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 /src/test_files.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 'src/test_files.py')
-rw-r--r-- | src/test_files.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/test_files.py b/src/test_files.py index b413853..7d8e75e 100644 --- a/src/test_files.py +++ b/src/test_files.py @@ -35,7 +35,6 @@ name of this script doesn't end in *Tests.py. import os import os.path import re -import string import TestSCons @@ -47,7 +46,7 @@ except KeyError: cwd = os.getcwd() def build_path(*args): - return apply(os.path.join, (cwd, 'build',) + args) + return os.path.join(cwd, 'build', *args) build_scons_tar_gz = build_path('unpack-tar-gz', 'scons-'+test.scons_version) build_scons_zip = build_path('unpack-zip', 'scons-'+test.scons_version) @@ -89,12 +88,12 @@ for directory, check_list in check.items(): if missing: print "Missing the following files:\n" - print "\t" + string.join(missing, "\n\t") + print "\t" + "\n\t".join(missing) test.fail_test(1) if no_result: print "Cannot check files, the following have apparently not been built:" - print "\t" + string.join(no_result, "\n\t") + print "\t" + "\n\t".join(no_result) test.no_result(1) test.pass_test() |