diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2016-01-12 15:30:35 -0800 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2016-01-12 15:30:35 -0800 |
| commit | 937ef23acd2cb7554224b4f9cc33c436e54bddf1 (patch) | |
| tree | 51ec290ad03a2d02ec0c5336ab6f7ca44e36870f /conformance/conformance_test.cc | |
| parent | da2eb68dd3ca18f152f8d7520e424b027ad729e5 (diff) | |
| parent | 7e74a02b17a5c2f6e67402455e9f32c360219ada (diff) | |
| download | protobuf-937ef23acd2cb7554224b4f9cc33c436e54bddf1.tar.gz protobuf-937ef23acd2cb7554224b4f9cc33c436e54bddf1.tar.bz2 protobuf-937ef23acd2cb7554224b4f9cc33c436e54bddf1.zip | |
Merge pull request #1080 from haberman/conformance-crashes
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; } |