diff options
| author | William Deegan <bill@baddogconsulting.com> | 2018-07-06 23:39:52 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2018-07-06 23:39:52 (GMT) |
| commit | b86c6d4c6ba1ff86897cbbed37ec5c228dfec40e (patch) | |
| tree | 137a3bbb06ec674f902bb3f47079ab57af54a62c /testing/framework | |
| parent | 2eb5ef5b755d6e9c7d66c1248f9c2574a3fe6a07 (diff) | |
| download | SCons-b86c6d4c6ba1ff86897cbbed37ec5c228dfec40e.zip SCons-b86c6d4c6ba1ff86897cbbed37ec5c228dfec40e.tar.gz SCons-b86c6d4c6ba1ff86897cbbed37ec5c228dfec40e.tar.bz2 | |
Change TestSCons's get_platform_python_info() to use the python which runtest.py was run with instead of blindly searching for python vis test.where_is(). This fixes an issue where the swig tests work fine with py3.6 but not with py2.7 on a win64 box with both installed, runtest launched via py -2 runtest.py ...
Diffstat (limited to 'testing/framework')
| -rw-r--r-- | testing/framework/TestSCons.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testing/framework/TestSCons.py b/testing/framework/TestSCons.py index c32e06a..e625865 100644 --- a/testing/framework/TestSCons.py +++ b/testing/framework/TestSCons.py @@ -1262,7 +1262,7 @@ SConscript( sconscript ) this platform and its associated include path, library path, and library name. """ - python = self.where_is('python') + python = os.environ.get('python_executable',self.where_is('python')) if not python: self.skip_test('Can not find installed "python", skipping test.\n') |