aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/csharp/tests.json
diff options
context:
space:
mode:
authorGravatar kkm <kkm@smartaction.com>2018-10-07 00:07:30 -0700
committerGravatar kkm <kkm@smartaction.com>2018-10-07 00:07:30 -0700
commit51e41ae7d5f513d948a4b38fdb0914f8f1bf4773 (patch)
treefec64dff9787b8c549c8af009e9a73549ac41ec5 /src/csharp/tests.json
parente3e7e32a7e1698c7937e5bf0bde4914e13131362 (diff)
parent3b26fe7262a9db90dfb69f84ad582d9f71871a5c (diff)
Merge remote-tracking branch 'golden/master' into package-grpc-tools
Diffstat (limited to 'src/csharp/tests.json')
-rw-r--r--src/csharp/tests.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/csharp/tests.json b/src/csharp/tests.json
index d06fbb7869..761308b33f 100644
--- a/src/csharp/tests.json
+++ b/src/csharp/tests.json
@@ -23,8 +23,10 @@
"Grpc.Core.Tests.ClientServerTest",
"Grpc.Core.Tests.CompressionTest",
"Grpc.Core.Tests.ContextPropagationTest",
+ "Grpc.Core.Tests.ContextualMarshallerTest",
"Grpc.Core.Tests.GrpcEnvironmentTest",
"Grpc.Core.Tests.HalfcloseTest",
+ "Grpc.Core.Tests.MarshallerTest",
"Grpc.Core.Tests.MarshallingErrorsTest",
"Grpc.Core.Tests.MetadataTest",
"Grpc.Core.Tests.PerformanceTest",