All tests pass again!

2 files changed, 8 insertions, 6 deletions

diff --git a/tests/pb/test_decoder.cc b/tests/pb/test_decoder.cc
index b2dd812..3c41801 100644
--- a/tests/pb/test_decoder.cc
+++ b/tests/pb/test_decoder.cc
@@ -454,8 +454,9 @@ upb::pb::DecoderMethodPtr global_method;
 
 upb::pb::DecoderPtr CreateDecoder(upb::Arena* arena,
                                   upb::pb::DecoderMethodPtr method,
-                                  upb::Sink sink) {
-  upb::pb::DecoderPtr ret = upb::pb::DecoderPtr::Create(arena, method, sink);
+                                  upb::Sink sink, upb::Status* status) {
+  upb::pb::DecoderPtr ret =
+      upb::pb::DecoderPtr::Create(arena, method, sink, status);
   ret.set_max_nesting(MAX_NESTING);
   return ret;
 }
@@ -556,7 +557,7 @@ void do_run_decoder(VerboseParserEnvironment* env, upb::pb::DecoderPtr decoder,
 void run_decoder(const string& proto, const string* expected_output) {
   VerboseParserEnvironment env(filter_hash != 0);
   upb::Sink sink(global_handlers, &closures[0]);
-  upb::pb::DecoderPtr decoder = CreateDecoder(env.arena(), global_method, sink);
+  upb::pb::DecoderPtr decoder = CreateDecoder(env.arena(), global_method, sink, env.status());
   env.ResetBytesSink(decoder.input());
   for (size_t i = 0; i < proto.size(); i++) {
     for (size_t j = i; j < UPB_MIN(proto.size(), i + 5); j++) {
@@ -874,7 +875,8 @@ void test_valid() {
     upb::Status status;
     upb::Arena arena;
     upb::Sink sink(global_handlers, &closures[0]);
-    upb::pb::DecoderPtr decoder = CreateDecoder(&arena, global_method, sink);
+    upb::pb::DecoderPtr decoder =
+        CreateDecoder(&arena, global_method, sink, &status);
     output.clear();
     bool ok = upb::PutBuffer(std::string(), decoder.input());
     ASSERT(ok);
@@ -1161,7 +1163,7 @@ void test_emptyhandlers(upb::SymbolTable* symtab, bool allowjit) {
     VerboseParserEnvironment env(filter_hash != 0);
     upb::Sink sink(global_method.dest_handlers(), &closures[0]);
     upb::pb::DecoderPtr decoder =
-        CreateDecoder(env.arena(), global_method, sink);
+        CreateDecoder(env.arena(), global_method, sink, env.status());
     env.ResetBytesSink(decoder.input());
     env.Reset(testdata[i].data, testdata[i].length, true, false);
     ASSERT(env.Start());
diff --git a/tests/pb/test_encoder.cc b/tests/pb/test_encoder.cc
index 7145097..a042d3d 100644
--- a/tests/pb/test_encoder.cc
+++ b/tests/pb/test_encoder.cc
@@ -48,7 +48,7 @@ void test_pb_roundtrip() {
   upb::pb::EncoderPtr encoder =
       upb::pb::EncoderPtr::Create(&arena, encoder_handlers, string_sink.input());
   upb::pb::DecoderPtr decoder =
-      upb::pb::DecoderPtr::Create(&arena, method, encoder.input());
+      upb::pb::DecoderPtr::Create(&arena, method, encoder.input(), &status);
   ok = upb::PutBuffer(input, decoder.input());
   ASSERT(ok);
   ASSERT(input == output);