diff options
| author |  Josh Haberman <jhaberman@gmail.com> | 2015-12-30 16:03:49 -0800 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-01-11 16:15:46 -0800 |
| commit | e891c29f9bc6aec94db80d44ed8c24d4142f7c3f (patch) | |
| tree | cf2b27b5a8fda53820c724d5ab130247c4ff4ddc /conformance/conformance_test.cc | |
| parent | c64146f195881f349bf470948d7b5e1e3704b077 (diff) | |
Allow conformance test runner to tolerate crashes, and re-enable conformance tests.
Diffstat (limited to 'conformance/conformance_test.cc')
| -rw-r--r-- | conformance/conformance_test.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/conformance/conformance_test.cc b/conformance/conformance_test.cc index a232ecc5..fc0605bf 100644 --- a/conformance/conformance_test.cc +++ b/conformance/conformance_test.cc @@ -299,7 +299,13 @@ void ConformanceTestSuite::RunValidInputTest( return; } - GOOGLE_CHECK(test_message.ParseFromString(binary_protobuf)); + if (!test_message.ParseFromString(binary_protobuf)) { + ReportFailure(test_name, request, response, + "INTERNAL ERROR: internal JSON->protobuf transcode " + "yielded unparseable proto."); + return; + } + break; } |