aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar David Garcia Quintas <dgq@google.com>2016-07-02 10:19:40 -0700
committerGravatar David Garcia Quintas <dgq@google.com>2016-07-02 10:19:40 -0700
commitfce332a4c46435537487fb1609b381bb8ea6e585 (patch)
treee2a1362a4d0c7da3f57e4f02385000da7367cc99 /tools
parentecbe2d52853ee70716479f0eaaef8564667255ec (diff)
parente38b917f9ee0e9f801384f6c89fe822f72eefa24 (diff)
Merge branch 'complicated-syndrome-of-the-alien-kind' of https://github.com/soltanmm/grpc into bb_reader_error
Diffstat (limited to 'tools')
-rwxr-xr-xtools/run_tests/run_tests.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 28a93dd822..c1254275e6 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -622,7 +622,10 @@ class ObjCLanguage(object):
def test_specs(self):
return [self.config.job_spec(['src/objective-c/tests/run_tests.sh'], None,
- environ=_FORCE_ENVIRON_FOR_WRAPPERS)]
+ environ=_FORCE_ENVIRON_FOR_WRAPPERS),
+ self.config.job_spec(['src/objective-c/tests/build_example_test.sh'],
+ None, timeout_seconds=15*60,
+ environ=_FORCE_ENVIRON_FOR_WRAPPERS)]
def pre_build_steps(self):
return []