aboutsummaryrefslogtreecommitdiffhomepage
path: root/conformance
diff options
context:
space:
mode:
authorGravatar Yilun Chong <yilunchong@google.com>2017-07-05 09:48:40 -0700
committerGravatar Yilun Chong <yilunchong@google.com>2017-07-05 09:48:40 -0700
commitcbf7dfb3233925639de99c2e3aea4c4676e886ad (patch)
tree5c8d1df1f49b095731365e0308e7727b18529795 /conformance
parent726ba33d98cd06c268f88b7dedf2a9a7916d978d (diff)
fix php failing list and csharp generated proto
Diffstat (limited to 'conformance')
-rw-r--r--conformance/failure_list_php.txt1
-rw-r--r--conformance/failure_list_php_c.txt1
2 files changed, 0 insertions, 2 deletions
diff --git a/conformance/failure_list_php.txt b/conformance/failure_list_php.txt
index ab9413bf..e06d07a1 100644
--- a/conformance/failure_list_php.txt
+++ b/conformance/failure_list_php.txt
@@ -116,4 +116,3 @@ Required.Proto3.JsonInput.Uint64FieldNotInteger
Required.Proto3.JsonInput.Int32FieldLeadingSpace
Required.Proto3.JsonInput.OneofFieldDuplicate
Required.Proto3.ProtobufInput.ValidDataRepeated.FLOAT.JsonOutput
-Recommended.Proto3.ProtobufInput.OneofZeroMessageSetTwice.JsonOutput
diff --git a/conformance/failure_list_php_c.txt b/conformance/failure_list_php_c.txt
index 2d23da16..2e378842 100644
--- a/conformance/failure_list_php_c.txt
+++ b/conformance/failure_list_php_c.txt
@@ -195,4 +195,3 @@ Required.Proto3.ProtobufInput.FloatFieldNormalizeSignalingNan.JsonOutput
Required.Proto3.ProtobufInput.ValidDataRepeated.FLOAT.JsonOutput
Required.TimestampProtoInputTooLarge.JsonOutput
Required.TimestampProtoInputTooSmall.JsonOutput
-Recommended.Proto3.ProtobufInput.OneofZeroMessageSetTwice.JsonOutput