From efcc51beba7a9716e05c8b63f340824cb2956367 Mon Sep 17 00:00:00 2001 From: Jorge Canizales Date: Fri, 24 Jun 2016 16:21:43 -0700 Subject: [PATCH] Investigate C++ flake in the old 0.14 branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes Jenkins for that branch, as a backwards-incompatible change was made in the script that runs the tests for all branches. The lines added are exactly the same as those now in master, so that the subsequent merge of 0.14 into master doesn’t conflict. --- tools/run_tests/run_tests.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 37291f4d3fb..4fc1be199cf 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -824,6 +824,8 @@ argp.add_argument('--update_submodules', default=[], nargs='*', argp.add_argument('-a', '--antagonists', default=0, type=int) argp.add_argument('-x', '--xml_report', default=None, type=str, help='Generates a JUnit-compatible XML report') +argp.add_argument('--force_default_poller', default=False, action='store_const', const=True, + help='Dont try to iterate over many polling strategies when they exist') args = argp.parse_args() jobset.measure_cpu_costs = args.measure_cpu_costs