summaryrefslogtreecommitdiff
path: root/src/test_files.py
diff options
context:
space:
mode:
authorLuca Falavigna <dktrkranz@debian.org>2010-06-15 14:28:22 +0000
committerLuca Falavigna <dktrkranz@debian.org>2010-06-15 14:28:22 +0000
commit738149c9bfb9965d013d01ef99f9bb1c2819e7e8 (patch)
tree0397d9bf3b12c903dc73419585df231397ff343c /src/test_files.py
parente7885e3af440eaef38a9301fd92a105afc8ddebb (diff)
Imported Upstream version 2.0.0upstream/2.0.0
Diffstat (limited to 'src/test_files.py')
-rw-r--r--src/test_files.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/test_files.py b/src/test_files.py
index 2d1294e..ef666c7 100644
--- a/src/test_files.py
+++ b/src/test_files.py
@@ -22,7 +22,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/test_files.py 4720 2010/03/24 03:14:11 jars"
+__revision__ = "src/test_files.py 5023 2010/06/14 22:05:46 scons"
"""
Verify that we have certain important files in our distribution
@@ -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()