diff options
| author | Stefan Zimmermann <zimmermann.code@gmail.com> | 2014-03-31 15:40:20 +0000 |
|---|---|---|
| committer | Stefan Zimmermann <zimmermann.code@gmail.com> | 2014-03-31 15:40:20 +0000 |
| commit | 78ce49b5b52d41ddccf41986faba5f1d2ddc8804 (patch) | |
| tree | e44c28ee21a3d4b59d2cab79a529be6a09907881 /QMTest | |
| parent | 425adf48bf2fcf5f2271c8d10e61810cf10169ed (diff) | |
| parent | f78a5612498648257400084a47dab9d94936eb11 (diff) | |
| download | scons-78ce49b5b52d41ddccf41986faba5f1d2ddc8804.tar.gz | |
Merged with [default]
Diffstat (limited to 'QMTest')
| -rw-r--r-- | QMTest/TestSCons.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 5d0b4c64..ef83a4a3 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -151,7 +151,7 @@ def deprecated_python_version(version=sys.version_info): if deprecated_python_version(): msg = r""" -scons: warning: Support for pre-2.4 Python (%s) is deprecated. +scons: warning: Support for pre-2.7.0 Python version (%s) is deprecated. If this will cause hardship, contact dev@scons.tigris.org. """ @@ -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): """ |