aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests/tests.json
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2015-07-17 22:59:53 -0700
committerGravatar Craig Tiller <ctiller@google.com>2015-07-17 22:59:53 -0700
commitb5980be9a08678212e5dbd6549b923f545d83539 (patch)
treee0318622c5a5576377537783608b60516b46c4cf /tools/run_tests/tests.json
parenta14215a67841ea7920260c655c01e4570595a3db (diff)
parentf87a0984ab727e95b068237f3bb0689d9685c8ea (diff)
Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other
Diffstat (limited to 'tools/run_tests/tests.json')
-rw-r--r--tools/run_tests/tests.json18
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json
index 9ea5267387..a08765e99b 100644
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@@ -534,15 +534,6 @@
{
"flaky": false,
"language": "c",
- "name": "time_test",
- "platforms": [
- "windows",
- "posix"
- ]
- },
- {
- "flaky": false,
- "language": "c",
"name": "timeout_encoding_test",
"platforms": [
"windows",
@@ -615,6 +606,15 @@
{
"flaky": false,
"language": "c++",
+ "name": "auth_property_iterator_test",
+ "platforms": [
+ "windows",
+ "posix"
+ ]
+ },
+ {
+ "flaky": false,
+ "language": "c++",
"name": "channel_arguments_test",
"platforms": [
"windows",