diff options
author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-12-03 03:07:43 +0100 |
---|---|---|
committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-12-03 03:07:43 +0100 |
commit | f72d7b5a79a815a1b383d62547f9ed6c655971f7 (patch) | |
tree | 3d9a82cc36348d799f649bbfa3251ad01ac6b742 /tools/run_tests/run_tests.py | |
parent | 028a4e9ee183f08c341c30fc495f1a2b17670ce0 (diff) |
Supporting Msys2's python.
Diffstat (limited to 'tools/run_tests/run_tests.py')
-rwxr-xr-x | tools/run_tests/run_tests.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index f1595ac98f..4c85f202f4 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -60,14 +60,7 @@ _FORCE_ENVIRON_FOR_WRAPPERS = {} def platform_string(): - if platform.system() == 'Windows': - return 'windows' - elif platform.system() == 'Darwin': - return 'mac' - elif platform.system() == 'Linux': - return 'linux' - else: - return 'posix' + return jobset.platform_string() # SimpleConfig: just compile with CONFIG=config, and run the binary to test @@ -640,7 +633,7 @@ if len(build_configs) > 1: print language, 'does not support multiple build configurations' sys.exit(1) -if platform.system() == 'Windows': +if platform_string() == 'windows': def make_jobspec(cfg, targets, makefile='Makefile'): extra_args = [] # better do parallel compilation @@ -770,7 +763,7 @@ def _start_port_server(port_server_port): '-p', '%d' % port_server_port, '-l', logfile] env = dict(os.environ) env['BUILD_ID'] = 'pleaseDontKillMeJenkins' - if platform.system() == 'Windows': + if platform_string() == 'windows': # Working directory of port server needs to be outside of Jenkins # workspace to prevent file lock issues. tempdir = tempfile.mkdtemp() |