diff options
| author |  Adam Cozzette <acozzette@google.com> | 2017-12-01 10:05:19 -0800 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2017-12-01 10:05:19 -0800 |
| commit | 0ba8eea655a5e40d19ab95c773192b5d908c5a61 (patch) | |
| tree | 4c2c97ade1ab197d361c146bacae5adde55986bf /conformance | |
| parent | 92a7e778e7394386f413cec28d67a07630f784b1 (diff) | |
| parent | a711e3d5b4ee1dd7f9d21197dca8432a5819a64e (diff) | |
Merge branch 'master' into down-integrate
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, |