diff options
| author |  Adam Cozzette <acozzette@google.com> | 2017-12-01 10:05:10 -0800 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2017-12-01 10:05:10 -0800 |
| commit | 92a7e778e7394386f413cec28d67a07630f784b1 (patch) | |
| tree | cb5673c7c09b0d3905b48a24765d07e423bc5b30 /conformance | |
| parent | ce0a53273a400369932ba788d17500336a6ecaad (diff) | |
Integrated internal changes from Google
Diffstat (limited to 'conformance')
| -rw-r--r-- | conformance/failure_list_cpp.txt | 1 | ||||
| -rw-r--r-- | conformance/failure_list_java.txt | 5 | ||||
| -rw-r--r-- | conformance/failure_list_python.txt | 3 | ||||
| -rw-r--r-- | conformance/failure_list_python_cpp.txt | 3 |
4 files changed, 10 insertions, 2 deletions
diff --git a/conformance/failure_list_cpp.txt b/conformance/failure_list_cpp.txt index 8c328890..752fbb5d 100644 --- a/conformance/failure_list_cpp.txt +++ b/conformance/failure_list_cpp.txt @@ -54,4 +54,3 @@ Required.Proto2.ProtobufInput.PrematureEofInPackedField.SINT32 Required.Proto2.ProtobufInput.PrematureEofInPackedField.SINT64 Required.Proto2.ProtobufInput.PrematureEofInPackedField.UINT32 Required.Proto2.ProtobufInput.PrematureEofInPackedField.UINT64 - diff --git a/conformance/failure_list_java.txt b/conformance/failure_list_java.txt index 5116c569..053bdaa4 100644 --- a/conformance/failure_list_java.txt +++ b/conformance/failure_list_java.txt @@ -44,4 +44,7 @@ Required.Proto3.JsonInput.StringFieldNotAString Required.Proto3.ProtobufInput.PrematureEofInDelimitedDataForKnownNonRepeatedValue.MESSAGE Required.Proto3.ProtobufInput.PrematureEofInDelimitedDataForKnownRepeatedValue.MESSAGE Required.Proto2.ProtobufInput.PrematureEofInDelimitedDataForKnownNonRepeatedValue.MESSAGE -Required.Proto2.ProtobufInput.PrematureEofInDelimitedDataForKnownRepeatedValue.MESSAGE
\ No newline at end of file +Required.Proto2.ProtobufInput.PrematureEofInDelimitedDataForKnownRepeatedValue.MESSAGE +# This test will be fixed as soon as we internally make the switch to +# preserving unknowns in proto3. +Required.Proto3.ProtobufInput.UnknownVarint.ProtobufOutput diff --git a/conformance/failure_list_python.txt b/conformance/failure_list_python.txt index e3ce7af7..b44c938d 100644 --- a/conformance/failure_list_python.txt +++ b/conformance/failure_list_python.txt @@ -19,3 +19,6 @@ Required.Proto3.ProtobufInput.IllegalZeroFieldNum_Case_0 Required.Proto3.ProtobufInput.IllegalZeroFieldNum_Case_1 Required.Proto3.ProtobufInput.IllegalZeroFieldNum_Case_2 Required.Proto3.ProtobufInput.IllegalZeroFieldNum_Case_3 +# This test will be fixed as soon as we internally make the switch to +# preserving unknowns in proto3. +Required.Proto3.ProtobufInput.UnknownVarint.ProtobufOutput diff --git a/conformance/failure_list_python_cpp.txt b/conformance/failure_list_python_cpp.txt index a498ad1a..7fada009 100644 --- a/conformance/failure_list_python_cpp.txt +++ b/conformance/failure_list_python_cpp.txt @@ -52,3 +52,6 @@ Required.Proto2.ProtobufInput.PrematureEofInPackedField.SINT32 Required.Proto2.ProtobufInput.PrematureEofInPackedField.SINT64 Required.Proto2.ProtobufInput.PrematureEofInPackedField.UINT32 Required.Proto2.ProtobufInput.PrematureEofInPackedField.UINT64 +# This test will be fixed as soon as we internally make the switch to +# preserving unknowns in proto3. +Required.Proto3.ProtobufInput.UnknownVarint.ProtobufOutput |