diff options
author | 2015-08-05 08:11:02 -0700 | |
---|---|---|
committer | 2015-08-05 08:11:02 -0700 | |
commit | a529eca9475cf7aae3d5615d59918283fac7b602 (patch) | |
tree | 3bf6fcf1dbde924593b7b385644bfc44077229f4 /tools/run_tests | |
parent | 9429b619d9bf0230b20e3619feae9c52c3881c3f (diff) | |
parent | 18541a1cee0263560e7cbe89312f51c674da8d4e (diff) |
Merge branch 'propagate' into reduce-mac-load
Diffstat (limited to 'tools/run_tests')
-rwxr-xr-x | tools/run_tests/jobset.py | 6 | ||||
-rwxr-xr-x | tools/run_tests/run_sanity.sh | 7 | ||||
-rwxr-xr-x | tools/run_tests/run_tests.py | 1 |
3 files changed, 11 insertions, 3 deletions
diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py index ec25b47610..e5e778a3f1 100755 --- a/tools/run_tests/jobset.py +++ b/tools/run_tests/jobset.py @@ -130,7 +130,8 @@ def which(filename): class JobSpec(object): """Specifies what to run for a job.""" - def __init__(self, cmdline, shortname=None, environ=None, hash_targets=None, cwd=None, shell=False): + def __init__(self, cmdline, shortname=None, environ=None, hash_targets=None, + cwd=None, shell=False, timeout_seconds=900): """ Arguments: cmdline: a list of arguments to pass as the command line @@ -148,6 +149,7 @@ class JobSpec(object): self.hash_targets = hash_targets or [] self.cwd = cwd self.shell = shell + self.timeout_seconds = timeout_seconds def identity(self): return '%r %r %r' % (self.cmdline, self.environ, self.hash_targets) @@ -206,7 +208,7 @@ class Job(object): do_newline=self._newline_on_success or self._travis) if self._bin_hash: update_cache.finished(self._spec.identity(), self._bin_hash) - elif self._state == _RUNNING and time.time() - self._start > 900: + elif self._state == _RUNNING and time.time() - self._start > self._spec.timeout_seconds: self._tempfile.seek(0) stdout = self._tempfile.read() filtered_stdout = filter(lambda x: x in string.printable, stdout.decode(errors='ignore')) diff --git a/tools/run_tests/run_sanity.sh b/tools/run_tests/run_sanity.sh index ebb09d9469..18d5ba026e 100755 --- a/tools/run_tests/run_sanity.sh +++ b/tools/run_tests/run_sanity.sh @@ -44,7 +44,12 @@ git submodule > $submodules diff -u $submodules - << EOF 05b155ff59114735ec8cd089f669c4c3d8f59029 third_party/gflags (v2.1.0-45-g05b155f) - 3df69d3aefde7671053d4e3c242b228e5d79c83f third_party/openssl (OpenSSL_1_0_2a) + 33dd08320648ac71d7d9d732be774ed3818dccc5 third_party/openssl (OpenSSL_1_0_2d) 3e2c8a5dd79481e1d36572cdf65be93514ba6581 third_party/protobuf (v3.0.0-alpha-1-1048-g3e2c8a5) 50893291621658f355bc5b4d450a8d06a563053d third_party/zlib (v1.2.8) EOF + +if [ -f cache.mk ] ; then + echo "Please don't commit cache.mk" + exit 1 +fi diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 5106fb70d1..482ffcc435 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -257,6 +257,7 @@ class CSharpLanguage(object): def test_specs(self, config, travis): assemblies = ['Grpc.Core.Tests', 'Grpc.Examples.Tests', + 'Grpc.HealthCheck.Tests', 'Grpc.IntegrationTesting'] if self.platform == 'windows': cmd = 'tools\\run_tests\\run_csharp.bat' |