diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-07-01 13:10:19 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-07-01 13:10:19 -0700 |
| commit | 85c0aa5b591779352d56e305e357f64ea55e6eab (patch) | |
| tree | 93b1534121bd9e7bd2f1eddfab84f8771c0290f1 /tools | |
| parent | 052f6498545d1a210f5bc84a6202f24e0e15c687 (diff) | |
| parent | e428dbc816deada2693546d49af2fe763db45871 (diff) | |
Merge branch 'iq2-pi' into delayed-write
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/run_tests/run_tests.py | 5 | ||||
| -rw-r--r-- | tools/run_tests/tests.json | 6 |
2 files changed, 8 insertions, 3 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 [] diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index dedd55774b..291ae415a4 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -1919,7 +1919,8 @@ "ci_platforms": [ "linux", "mac", - "posix" + "posix", + "windows" ], "cpu_cost": 1.0, "exclude_configs": [], @@ -1930,7 +1931,8 @@ "platforms": [ "linux", "mac", - "posix" + "posix", + "windows" ] }, { |