diff options
| author |  Matt Kwong <matt-kwong@users.noreply.github.com> | 2017-05-11 15:25:51 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-05-11 15:25:51 -0700 |
| commit | 3f988604d29cf965e4fb66b27fb354531e15b016 (patch) | |
| tree | 71bae1953938c691042c1347e06c6be46e202d23 /tools/run_tests | |
| parent | 45b89fb11ca3cd524787aeba7a1270f744a1256c (diff) | |
| parent | a5b29a3961115dd60c467413dba4b1cef4597838 (diff) | |
Merge pull request #11086 from matt-kwong/upload_mac
Enable uploading Jenkins test results on Mac workers
Diffstat (limited to 'tools/run_tests')
| -rwxr-xr-x | tools/run_tests/python_utils/jobset.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/run_tests/python_utils/jobset.py b/tools/run_tests/python_utils/jobset.py index 4e97128d46..c1b1c88f55 100755 --- a/tools/run_tests/python_utils/jobset.py +++ b/tools/run_tests/python_utils/jobset.py @@ -255,7 +255,7 @@ class Job(object): self._start = time.time() cmdline = self._spec.cmdline if measure_cpu_costs: - cmdline = ['time', '--portability'] + cmdline + cmdline = ['time', '-p'] + cmdline try_start = lambda: subprocess.Popen(args=cmdline, stderr=subprocess.STDOUT, stdout=self._tempfile, @@ -307,7 +307,7 @@ class Job(object): self._state = _SUCCESS measurement = '' if measure_cpu_costs: - m = re.search(r'real ([0-9.]+)\nuser ([0-9.]+)\nsys ([0-9.]+)', stdout()) + m = re.search(r'real\s+([0-9.]+)\nuser\s+([0-9.]+)\nsys\s+([0-9.]+)', stdout()) real = float(m.group(1)) user = float(m.group(2)) sys = float(m.group(3)) |