diff options
| author |  Adam Cozzette <acozzette@google.com> | 2017-11-30 13:34:51 -0800 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2017-11-30 13:34:51 -0800 |
| commit | a27da093393d3dc7301d27fe328284335cb98528 (patch) | |
| tree | f594ef198ba98a8860b26b3db6cfcc718222ca19 /conformance | |
| parent | 6de51caed52d798815954646b230c5aef3e4d2fc (diff) | |
| parent | 94bb1eed17209cacfdf2571be5a1ae91b3964cff (diff) | |
Merge branch '3.5.x' into 3.5.x-merge
Diffstat (limited to 'conformance')
| -rw-r--r-- | conformance/conformance_test.cc | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/conformance/conformance_test.cc b/conformance/conformance_test.cc index c54d4ccd..98c2eae4 100644 --- a/conformance/conformance_test.cc +++ b/conformance/conformance_test.cc @@ -1842,6 +1842,14 @@ bool ConformanceTestSuite::RunSuite(ConformanceTestRunner* runner, "optionalInt64": null, "optionalUint32": null, "optionalUint64": null, + "optionalSint32": null, + "optionalSint64": null, + "optionalFixed32": null, + "optionalFixed64": null, + "optionalSfixed32": null, + "optionalSfixed64": null, + "optionalFloat": null, + "optionalDouble": null, "optionalBool": null, "optionalString": null, "optionalBytes": null, @@ -1851,6 +1859,14 @@ bool ConformanceTestSuite::RunSuite(ConformanceTestRunner* runner, "repeatedInt64": null, "repeatedUint32": null, "repeatedUint64": null, + "repeatedSint32": null, + "repeatedSint64": null, + "repeatedFixed32": null, + "repeatedFixed64": null, + "repeatedSfixed32": null, + "repeatedSfixed64": null, + "repeatedFloat": null, + "repeatedDouble": null, "repeatedBool": null, "repeatedString": null, "repeatedBytes": null, |