diff options
-rw-r--r-- | src/core/lib/iomgr/exec_ctx.cc | 9 | ||||
-rwxr-xr-x | tools/run_tests/run_tests.py | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index 3d17afcb8f..0394a00f3e 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -152,6 +152,15 @@ void grpc_exec_ctx_invalidate_now(grpc_exec_ctx *exec_ctx) { gpr_timespec grpc_millis_to_timespec(grpc_millis millis, gpr_clock_type clock_type) { + // special-case infinities as grpc_millis can be 32bit on some platforms + // while gpr_time_from_millis always takes an int64_t. + if (millis == GRPC_MILLIS_INF_FUTURE) { + return gpr_inf_future(clock_type); + } + if (millis == GRPC_MILLIS_INF_PAST) { + return gpr_inf_past(clock_type); + } + if (clock_type == GPR_TIMESPAN) { return gpr_time_from_millis(millis, GPR_TIMESPAN); } diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 588784353a..4c3db14fed 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -340,12 +340,12 @@ class CLanguage(object): with open(os.devnull, 'w') as fnull: tests = subprocess.check_output([binary, '--benchmark_list_tests'], stderr=fnull) - base = None for line in tests.split('\n'): test = line.strip() + if not test: continue cmdline = [binary, '--benchmark_filter=%s$' % test] + target['args'] out.append(self.config.job_spec(cmdline, - shortname='%s:%s %s' % (binary, test, shortname_ext), + shortname='%s %s' % (' '.join(cmdline), shortname_ext), cpu_cost=cpu_cost, timeout_seconds=_DEFAULT_TIMEOUT_SECONDS * timeout_scaling, environ=env)) |