summaryrefslogtreecommitdiffstats
path: root/test/runtest
diff options
context:
space:
mode:
authorGreg Noel <GregNoel@tigris.org>2010-03-25 04:14:28 (GMT)
committerGreg Noel <GregNoel@tigris.org>2010-03-25 04:14:28 (GMT)
commit22d352500f1cd6bd0c53d788a5dc44a1fefa676e (patch)
tree0984fd581082c27cfbfbb7f94d5751b0e6fd2741 /test/runtest
parent75ac32ac8e32076e25b72a19eb56340cc585fa4e (diff)
downloadSCons-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/runtest')
-rw-r--r--test/runtest/fallback.py7
-rw-r--r--test/runtest/noqmtest.py3
-rw-r--r--test/runtest/python.py3
-rw-r--r--test/runtest/qmtest.py3
-rw-r--r--test/runtest/xml/output.py1
5 files changed, 6 insertions, 11 deletions
diff --git a/test/runtest/fallback.py b/test/runtest/fallback.py
index 6a971f8..027d79d 100644
--- a/test/runtest/fallback.py
+++ b/test/runtest/fallback.py
@@ -30,7 +30,6 @@ if it can't find qmtest on the $PATH.
"""
import os
-import string
import TestRuntest
@@ -42,9 +41,9 @@ test = TestRuntest.TestRuntest(noqmtest=1)
while test.where_is('qmtest'):
qmtest=test.where_is('qmtest')
dir = os.path.split(qmtest)[0]
- path = string.split(os.environ['PATH'], os.pathsep)
+ path = os.environ['PATH'].split(os.pathsep)
path.remove(dir)
- os.environ['PATH'] = string.join(path, os.pathsep)
+ os.environ['PATH'] = os.pathsep.join(path)
test.subdir('test')
@@ -83,7 +82,7 @@ testlist = [
test_pass_py,
]
-test.run(arguments = string.join(testlist),
+test.run(arguments = ' '.join(testlist),
status = 1,
stdout = expect_stdout,
stderr = expect_stderr)
diff --git a/test/runtest/noqmtest.py b/test/runtest/noqmtest.py
index 78b021d..99352a1 100644
--- a/test/runtest/noqmtest.py
+++ b/test/runtest/noqmtest.py
@@ -30,7 +30,6 @@ using qmtest.
"""
import os
-import string
import TestRuntest
@@ -75,7 +74,7 @@ testlist = [
test_pass_py,
]
-test.run(arguments = '--noqmtest %s' % string.join(testlist),
+test.run(arguments = '--noqmtest %s' % ' '.join(testlist),
status = 1,
stdout = expect_stdout,
stderr = expect_stderr)
diff --git a/test/runtest/python.py b/test/runtest/python.py
index 9579746..5c2f737 100644
--- a/test/runtest/python.py
+++ b/test/runtest/python.py
@@ -30,7 +30,6 @@ Test that the -P option lets us specify a Python version to use.
import os
import re
-import string
if not hasattr(os.path, 'pardir'):
os.path.pardir = '..'
@@ -47,7 +46,7 @@ head, dir = os.path.split(head)
mypython = os.path.join(head, dir, os.path.pardir, dir, python)
def escape(s):
- return string.replace(s, '\\', '\\\\')
+ return s.replace('\\', '\\\\')
if re.search('\s', mypython):
mypythonstring = '"%s"' % escape(mypython)
diff --git a/test/runtest/qmtest.py b/test/runtest/qmtest.py
index 9f9274e..de04c3f 100644
--- a/test/runtest/qmtest.py
+++ b/test/runtest/qmtest.py
@@ -30,7 +30,6 @@ not directly via Python.
"""
import os.path
-import string
import TestRuntest
@@ -92,7 +91,7 @@ testlist = [
test_pass_py,
]
-test.run(arguments='--qmtest %s' % string.join(testlist),
+test.run(arguments='--qmtest %s' % ' '.join(testlist),
status=1,
stdout=expect_stdout)
diff --git a/test/runtest/xml/output.py b/test/runtest/xml/output.py
index c024f37..7bf6b2d 100644
--- a/test/runtest/xml/output.py
+++ b/test/runtest/xml/output.py
@@ -30,7 +30,6 @@ Test writing XML output to a file.
import os
import re
-import string
import TestCmd
import TestRuntest