aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar Sree Kuchibhotla <sreek@google.com>2017-02-02 09:39:07 -0800
committerGravatar Sree Kuchibhotla <sreek@google.com>2017-02-02 09:39:07 -0800
commit6613168ad609c0cfe7651fb33e8fbc0f1638dbb7 (patch)
tree933b58629efafa521100c505084dedc05f5651eb /tools
parent5862f76bd14be059b1ffcd27d72548adede7e7b3 (diff)
parent26623b3d77ae78e66f66b996593acf57a7cf1197 (diff)
Merge branch 'master' into pollset_set_test
Diffstat (limited to 'tools')
-rw-r--r--tools/run_tests/generated/tests.json6
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 532380b145..393d05edc0 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -2452,8 +2452,7 @@
"ci_platforms": [
"linux",
"mac",
- "posix",
- "windows"
+ "posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
@@ -2465,8 +2464,7 @@
"platforms": [
"linux",
"mac",
- "posix",
- "windows"
+ "posix"
]
},
{