diff options
Diffstat (limited to 'QMTest')
| -rw-r--r-- | QMTest/README.txt | 2 | ||||
| -rw-r--r-- | QMTest/TestCmd.py | 5 | ||||
| -rw-r--r-- | QMTest/TestRuntest.py | 2 | ||||
| -rw-r--r-- | QMTest/TestSCons.py | 22 | ||||
| -rw-r--r-- | QMTest/TestSConsMSVS.py | 2 | ||||
| -rw-r--r-- | QMTest/TestSCons_time.py | 2 | ||||
| -rw-r--r-- | QMTest/TestSConsign.py | 2 | ||||
| -rw-r--r-- | QMTest/scons_tdb.py | 2 |
8 files changed, 25 insertions, 14 deletions
diff --git a/QMTest/README.txt b/QMTest/README.txt index e279d71..a5e9e97 100644 --- a/QMTest/README.txt +++ b/QMTest/README.txt @@ -55,4 +55,4 @@ the pieces here are local to SCons. really using it as originally envisioned. Copyright (c) 2001 - 2014 The SCons Foundation -QMTest/README.txt 2014/07/05 09:42:21 garyo +QMTest/README.txt 2014/08/24 12:12:31 garyo diff --git a/QMTest/TestCmd.py b/QMTest/TestCmd.py index b51d90f..3048973 100644 --- a/QMTest/TestCmd.py +++ b/QMTest/TestCmd.py @@ -486,7 +486,8 @@ def match_re(lines = None, res = None): """ """ if not is_List(lines): - lines = lines.split("\n") + # CRs mess up matching (Windows) so split carefully + lines = re.split('\r?\n', lines) if not is_List(res): res = res.split("\n") if len(lines) != len(res): @@ -683,7 +684,7 @@ if subprocess.mswindows: assert ol is None lpBuffer = ctypes.create_string_buffer(bufSize) bytesRead = DWORD() - bErr = ctypes.windll.kernel32.ReadFile( + bErr = ctypes.windll.kernel32.ReadFile( hFile, lpBuffer, bufSize, ctypes.byref(bytesRead), ol) if not bErr: raise ctypes.WinError() return (0, ctypes.string_at(lpBuffer, bytesRead.value)) diff --git a/QMTest/TestRuntest.py b/QMTest/TestRuntest.py index c4f9301..abda7b1 100644 --- a/QMTest/TestRuntest.py +++ b/QMTest/TestRuntest.py @@ -14,7 +14,7 @@ attributes defined in this subclass. # Copyright (c) 2001 - 2014 The SCons Foundation -__revision__ = "QMTest/TestRuntest.py 2014/07/05 09:42:21 garyo" +__revision__ = "QMTest/TestRuntest.py 2014/08/24 12:12:31 garyo" import os import os.path diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 24f285a..eac25d1 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -15,7 +15,7 @@ attributes defined in this subclass. # Copyright (c) 2001 - 2014 The SCons Foundation from __future__ import division -__revision__ = "QMTest/TestSCons.py 2014/07/05 09:42:21 garyo" +__revision__ = "QMTest/TestSCons.py 2014/08/24 12:12:31 garyo" import os import re @@ -34,7 +34,7 @@ from TestCmd import PIPE # here provides some independent verification that what we packaged # conforms to what we expect. -default_version = '2.3.2' +default_version = '2.3.3' python_version_unsupported = (2, 3, 0) python_version_deprecated = (2, 7, 0) @@ -43,7 +43,7 @@ python_version_deprecated = (2, 7, 0) # line must remain "__ VERSION __" (without the spaces) so the built # version in build/QMTest/TestSCons.py contains the actual version # string of the packages that have been built. -SConsVersion = '2.3.2' +SConsVersion = '2.3.3' if SConsVersion == '__' + 'VERSION' + '__': SConsVersion = default_version @@ -1129,11 +1129,21 @@ SConscript( sconscript ) self.run(program = python, stdin = """\ import os, sys try: - py_ver = 'python%d.%d' % sys.version_info[:2] + if sys.platform == 'win32': + py_ver = 'python%d%d' % sys.version_info[:2] + else: + py_ver = 'python%d.%d' % sys.version_info[:2] except AttributeError: 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 include and lib path +try: + import distutils.sysconfig + exec_prefix = distutils.sysconfig.EXEC_PREFIX + print distutils.sysconfig.get_python_inc() + print os.path.join(exec_prefix, 'libs') +except: + print os.path.join(sys.prefix, 'include', py_ver) + print os.path.join(sys.prefix, 'lib', py_ver, 'config') print py_ver """) diff --git a/QMTest/TestSConsMSVS.py b/QMTest/TestSConsMSVS.py index cad1849..54c5a91 100644 --- a/QMTest/TestSConsMSVS.py +++ b/QMTest/TestSConsMSVS.py @@ -15,7 +15,7 @@ in this subclass. # Copyright (c) 2001 - 2014 The SCons Foundation -__revision__ = "QMTest/TestSConsMSVS.py 2014/07/05 09:42:21 garyo" +__revision__ = "QMTest/TestSConsMSVS.py 2014/08/24 12:12:31 garyo" import os import sys diff --git a/QMTest/TestSCons_time.py b/QMTest/TestSCons_time.py index 2ce4b69..61964eb 100644 --- a/QMTest/TestSCons_time.py +++ b/QMTest/TestSCons_time.py @@ -13,7 +13,7 @@ attributes defined in this subclass. # Copyright (c) 2001 - 2014 The SCons Foundation -__revision__ = "QMTest/TestSCons_time.py 2014/07/05 09:42:21 garyo" +__revision__ = "QMTest/TestSCons_time.py 2014/08/24 12:12:31 garyo" import os import os.path diff --git a/QMTest/TestSConsign.py b/QMTest/TestSConsign.py index 579cb4b..60f5d52 100644 --- a/QMTest/TestSConsign.py +++ b/QMTest/TestSConsign.py @@ -1,6 +1,6 @@ # Copyright (c) 2001 - 2014 The SCons Foundation -__revision__ = "QMTest/TestSConsign.py 2014/07/05 09:42:21 garyo" +__revision__ = "QMTest/TestSConsign.py 2014/08/24 12:12:31 garyo" __doc__ = """ TestSConsign.py: a testing framework for the "sconsign" script diff --git a/QMTest/scons_tdb.py b/QMTest/scons_tdb.py index fa48c50..8302162 100644 --- a/QMTest/scons_tdb.py +++ b/QMTest/scons_tdb.py @@ -28,7 +28,7 @@ QMTest classes to support SCons' testing and Aegis-inspired workflow. Thanks to Stefan Seefeld for the initial code. """ -__revision__ = "QMTest/scons_tdb.py 2014/07/05 09:42:21 garyo" +__revision__ = "QMTest/scons_tdb.py 2014/08/24 12:12:31 garyo" ######################################################################## # Imports |