diff options
author | 2018-09-28 16:38:53 -0700 | |
---|---|---|
committer | 2018-09-28 16:38:53 -0700 | |
commit | 4f940918b126dc9348b1f2e21d66fc6aeae4b193 (patch) | |
tree | 0ff0f7f25d52c26b9f6053b54500ebbb6df74602 /src/csharp/tests.json | |
parent | 82b2e2977d5cd144c6e2350d55b6f928fd8f6ce7 (diff) | |
parent | f15e3bbc357bd542d83d6b478621bc1f0c3b1f8c (diff) |
Merge branch 'master' into sreek-pe-doc
Diffstat (limited to 'src/csharp/tests.json')
-rw-r--r-- | src/csharp/tests.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/csharp/tests.json b/src/csharp/tests.json index c2f243fe0a..5683d164c6 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", |