summaryrefslogtreecommitdiff
path: root/test/gnutools.py
diff options
context:
space:
mode:
authorGreg Noel <GregNoel@tigris.org>2010-03-25 04:14:28 +0000
committerGreg Noel <GregNoel@tigris.org>2010-03-25 04:14:28 +0000
commitaf6d7c35464bb75dcabc72094b4bd84154dde50d (patch)
tree0984fd581082c27cfbfbb7f94d5751b0e6fd2741 /test/gnutools.py
parent55ef7fe83e3211be3045f089767ca8e198db1c2c (diff)
downloadscons-af6d7c35464bb75dcabc72094b4bd84154dde50d.tar.gz
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/gnutools.py')
-rw-r--r--test/gnutools.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/test/gnutools.py b/test/gnutools.py
index ee082e3d..e1b7e42b 100644
--- a/test/gnutools.py
+++ b/test/gnutools.py
@@ -29,7 +29,6 @@ Testing the gnu tool chain, i.e. the tools 'gcc', 'g++' and 'gnulink'.
"""
import TestSCons
-import string
import sys
_python_ = TestSCons._python_
@@ -116,8 +115,8 @@ test.run(chdir='work1')
def testObject(test, obj, expect):
contents = test.read(test.workpath('work1', obj))
- line1 = string.split(contents,'\n')[0]
- actual = string.join(string.split(line1))
+ line1 = contents.split('\n')[0]
+ actual = ' '.join(line1.split())
if not expect == actual:
print "%s: %s != %s\n" % (obj, repr(expect), repr(actual))
test.fail_test()