diff options
| author | Paul Yang <TeBoring@users.noreply.github.com> | 2018-08-31 10:47:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-31 10:47:58 -0700 |
| commit | 98e26a41956bd8ec1f96f52c5b54ecfa011721ef (patch) | |
| tree | ba11bca5c90fc3f8a2595d97e4075881521909f7 | |
| parent | 9a8d9b1014448ffd4177ca78deccec4cf06223e9 (diff) | |
| download | protobuf-98e26a41956bd8ec1f96f52c5b54ecfa011721ef.tar.gz protobuf-98e26a41956bd8ec1f96f52c5b54ecfa011721ef.tar.bz2 protobuf-98e26a41956bd8ec1f96f52c5b54ecfa011721ef.zip | |
Add missing reference to conformanc_test_impl.cc in Makefile (#5100)
* Add missing reference to conformanc_test_impl.cc in Makefile
* Update conformance failure list
| -rw-r--r-- | conformance/Makefile.am | 1 | ||||
| -rw-r--r-- | conformance/failure_list_php_c.txt | 2 | ||||
| -rw-r--r-- | conformance/failure_list_ruby.txt | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/conformance/Makefile.am b/conformance/Makefile.am index e51ab80a..29d9a981 100644 --- a/conformance/Makefile.am +++ b/conformance/Makefile.am @@ -206,6 +206,7 @@ EXTRA_DIST = \ conformance_test_runner_LDADD = $(top_srcdir)/src/libprotobuf.la conformance_test_runner_SOURCES = conformance_test.h conformance_test.cc \ + conformance_test_impl.cc \ conformance_test_runner.cc \ third_party/jsoncpp/json.h \ third_party/jsoncpp/jsoncpp.cpp diff --git a/conformance/failure_list_php_c.txt b/conformance/failure_list_php_c.txt index bb32ace5..17e0fda4 100644 --- a/conformance/failure_list_php_c.txt +++ b/conformance/failure_list_php_c.txt @@ -93,8 +93,6 @@ Required.Proto3.JsonInput.ValueAcceptInteger.JsonOutput Required.Proto3.JsonInput.ValueAcceptInteger.ProtobufOutput Required.Proto3.JsonInput.ValueAcceptList.JsonOutput Required.Proto3.JsonInput.ValueAcceptList.ProtobufOutput -Required.Proto3.JsonInput.ValueAcceptListWithNull.JsonOutput -Required.Proto3.JsonInput.ValueAcceptListWithNull.ProtobufOutput Required.Proto3.JsonInput.ValueAcceptNull.JsonOutput Required.Proto3.JsonInput.ValueAcceptNull.ProtobufOutput Required.Proto3.JsonInput.ValueAcceptObject.JsonOutput diff --git a/conformance/failure_list_ruby.txt b/conformance/failure_list_ruby.txt index 1bab1359..53b49701 100644 --- a/conformance/failure_list_ruby.txt +++ b/conformance/failure_list_ruby.txt @@ -133,3 +133,9 @@ Required.Proto3.ProtobufInput.FloatFieldNormalizeSignalingNan.JsonOutput Required.Proto3.ProtobufInput.ValidDataRepeated.FLOAT.JsonOutput Required.TimestampProtoInputTooLarge.JsonOutput Required.TimestampProtoInputTooSmall.JsonOutput +Required.Proto3.JsonInput.IgnoreUnknownJsonFalse.ProtobufOutput +Required.Proto3.JsonInput.IgnoreUnknownJsonNull.ProtobufOutput +Required.Proto3.JsonInput.IgnoreUnknownJsonNumber.ProtobufOutput +Required.Proto3.JsonInput.IgnoreUnknownJsonObject.ProtobufOutput +Required.Proto3.JsonInput.IgnoreUnknownJsonString.ProtobufOutput +Required.Proto3.JsonInput.IgnoreUnknownJsonTrue.ProtobufOutput |