summaryrefslogtreecommitdiffstats
path: root/QMTest
diff options
context:
space:
mode:
authorTom Tanner <ttanner2@bloomberg.net>2013-10-08 11:54:25 (GMT)
committerTom Tanner <ttanner2@bloomberg.net>2013-10-08 11:54:25 (GMT)
commit91020237d64f53b2fa6e2b5bf155a1d8bfbdb547 (patch)
tree9ce325ceebe6b4f0786cea051b8e82038cf04cee /QMTest
parent0359ca7ad334f499031aacb46c0e1a6b33789024 (diff)
downloadSCons-91020237d64f53b2fa6e2b5bf155a1d8bfbdb547.zip
SCons-91020237d64f53b2fa6e2b5bf155a1d8bfbdb547.tar.gz
SCons-91020237d64f53b2fa6e2b5bf155a1d8bfbdb547.tar.bz2
Adding documentation and a couple of tests
Diffstat (limited to 'QMTest')
-rw-r--r--QMTest/TestSCons.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 84cc60f..c45ef5e 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -1131,9 +1131,9 @@ SConscript( sconscript )
self.run(program = python, stdin = """\
import os, sys
try:
- py_ver = 'python%d.%d' % sys.version_info[:2]
+ py_ver = 'python%d.%d' % sys.version_info[:2]
except AttributeError:
- py_ver = 'python' + sys.version[:3]
+ py_ver = 'python' + sys.version[:3]
print os.path.join(sys.prefix, 'include', py_ver)
print os.path.join(sys.prefix, 'lib', py_ver, 'config')
print py_ver
@@ -1357,7 +1357,7 @@ class TimeSCons(TestSCons):
options = kw.get('options', '')
if additional is not None:
options += additional
- kw['options'] = options + ' --debug=memory --debug=time'
+ kw['options'] = options + ' --debug=memory,time'
def startup(self, *args, **kw):
"""