diff options
| author |  Matt Kwong <matt-kwong@users.noreply.github.com> | 2017-05-31 15:16:31 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-05-31 15:16:31 -0700 |
| commit | 4e55bf12936a304aebe0b00d0a6270a35730571e (patch) | |
| tree | c6e5f9db8419017a221a406dd2ce508796cf3fed /tools/run_tests/python_utils | |
| parent | f9b90428df3496175cf30b2a905d4dd1652463a3 (diff) | |
| parent | d8543c4e0f4ff827337654e198d41ff5539a2b9e (diff) | |
Merge pull request #11348 from matt-kwong/upload_windows
Enable uploading more test results to BQ
Diffstat (limited to 'tools/run_tests/python_utils')
| -rwxr-xr-x | tools/run_tests/python_utils/jobset.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/run_tests/python_utils/jobset.py b/tools/run_tests/python_utils/jobset.py index 3ff773300f..def612881e 100755 --- a/tools/run_tests/python_utils/jobset.py +++ b/tools/run_tests/python_utils/jobset.py @@ -276,8 +276,13 @@ class Job(object): env = sanitized_environment(env) self._start = time.time() cmdline = self._spec.cmdline - if measure_cpu_costs: + # The Unix time command is finicky when used with MSBuild, so we don't use it + # with jobs that run MSBuild. + global measure_cpu_costs + if measure_cpu_costs and not 'vsprojects\\build' in cmdline[0]: cmdline = ['time', '-p'] + cmdline + else: + measure_cpu_costs = False try_start = lambda: subprocess.Popen(args=cmdline, stderr=subprocess.STDOUT, stdout=self._tempfile, |