aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests/generated/tests.json
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2017-10-17 14:59:16 -0700
committerGravatar Craig Tiller <ctiller@google.com>2017-10-17 14:59:16 -0700
commitbe6141dc91e02da0391d6b0c280d98714e80a497 (patch)
tree4ffc9cfe453fdd61abf8a1aeba190667fa83b65e /tools/run_tests/generated/tests.json
parent48ff130ba2461b222f69ebe54edc41f43f915ba1 (diff)
Fix merge
Diffstat (limited to 'tools/run_tests/generated/tests.json')
-rw-r--r--tools/run_tests/generated/tests.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index b5e05589d4..34412523e9 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -4524,6 +4524,7 @@
},
{
"args": [],
+ "benchmark": false,
"ci_platforms": [
"linux",
"mac",