diff options
author | 2015-08-05 09:27:39 -0700 | |
---|---|---|
committer | 2015-08-05 09:27:39 -0700 | |
commit | 38ed056304503b5a042d7145563fad7d509935a2 (patch) | |
tree | 9cfd5d1844486f44b1fcb2a8020732a6fb6e6f51 /tools | |
parent | 297a25b0cf22bdc3a77f748c0d785095fa1fae1d (diff) | |
parent | 3bbacf1b5ece50a8f9a945c88e2f81d3f8594e47 (diff) |
Merge remote-tracking branch 'upstream/master' into stuboptions
Diffstat (limited to 'tools')
-rw-r--r-- | tools/README.md | 18 | ||||
-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 |
4 files changed, 23 insertions, 9 deletions
diff --git a/tools/README.md b/tools/README.md index 3daf73228c..be7d84b373 100644 --- a/tools/README.md +++ b/tools/README.md @@ -1,11 +1,17 @@ -buildgen: contains the template renderer for our build system. +buildgen: template renderer for our build system. -distpackages: contains script to generate debian packages. +distpackages: script to generate debian packages. -dockerfile: contains all of the docker files to test gRPC. +distrib: scripts to distribute language-specific packages. -gce_setup: contains boilerplate for running the docker files under GCE. +dockerfile: Docker files to test gRPC. -jenkins: support for running tests on Jenkins +doxygen: gRPC C/C++ documentation generation via Doxygen. -run_tests: contains python scripts to properly run the tests in parallel. +gce_setup: boilerplate to run the Docker files under GCE. + +jenkins: support for running tests on Jenkins. + +profile_analyzer: pretty printer for gRPC profiling data. + +run_tests: scripts to run gRPC tests in parallel. 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 fa749498d2..b93f584095 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -254,6 +254,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' |