diff options
| author |  Jorge Canizales <jcanizales@google.com> | 2016-06-24 12:48:43 -0700 |
|---|---|---|
| committer | Jorge Canizales <jcanizales@google.com> | 2016-06-24 12:48:43 -0700 |
| commit | 8a556b7fe34355faf6573d8958cdb0730dd41956 (patch) | |
| tree | 06ca945c0cb9d31c640b13eda3fcb1de4b084aff /tools/buildgen/plugins/make_fuzzer_tests.py | |
| parent | fa70dacf95b93486b7dfe0c21ada90d75a5d5bcd (diff) | |
| parent | 0140f7c9e6c20fe78035d9635a3f5725d51ad35a (diff) | |
Merge master into let-invalidate-channels
Had to manually resolve import conflicts in InteropTests.m
To be fair, the merge algorithm should have been able to do it.
Diffstat (limited to 'tools/buildgen/plugins/make_fuzzer_tests.py')
| -rw-r--r-- | tools/buildgen/plugins/make_fuzzer_tests.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/buildgen/plugins/make_fuzzer_tests.py b/tools/buildgen/plugins/make_fuzzer_tests.py index 9d0006973a..1d215e9fe0 100644 --- a/tools/buildgen/plugins/make_fuzzer_tests.py +++ b/tools/buildgen/plugins/make_fuzzer_tests.py @@ -49,7 +49,8 @@ def mako_plugin(dictionary): tests.append({ 'name': new_target['name'], 'args': [fn], - 'exclude_configs': [], + 'exclude_configs': ['tsan'], + 'uses_polling': False, 'platforms': ['linux'], 'ci_platforms': ['linux'], 'flaky': False, |