commit 3ae0490c0c6c06951a6fe2663d75e0c32bc3836c
author Haibo Huang <hhb@google.com> Fri May 29 19:34:33 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 29 19:34:33 2020 +0000
tree 7904d7a231f7eda40f14a7adc36b33f1e5ad87bf
parent c0ee4843e4543d498a749da85e05b6e979a15dd7
parent f0bf6bdf2e02492ae9920c6131706a0cc60f87db

Upgrade libprotobuf-mutator to 7a2ed51a6b682a83e345ff49fc4cfd7ca47550db am: 1a7c730957 am: f0bf6bdf2e

Change-Id: I00e7ed78b2fad0e4ad7f3b8c834899231bd78702

METADATA

diff --git a/METADATA b/METADATA
index 9a70f0a..ca1c076 100644
--- a/METADATA
+++ b/METADATA
@@ -5,11 +5,11 @@
     type: GIT
     value: "https://github.com/google/libprotobuf-mutator"
   }
-  version: "ec3cf7166aa7a190d9b6e81583dcc926e2f312cf"
+  version: "7a2ed51a6b682a83e345ff49fc4cfd7ca47550db"
   license_type: NOTICE
   last_upgrade_date {
     year: 2020
-    month: 4
-    day: 27
+    month: 5
+    day: 28
   }
 }

cmake/external/protobuf.cmake

diff --git a/cmake/external/protobuf.cmake b/cmake/external/protobuf.cmake
index 50277b6..212c40f 100644
--- a/cmake/external/protobuf.cmake
+++ b/cmake/external/protobuf.cmake
@@ -63,7 +63,7 @@
 ExternalProject_Add(${PROTOBUF_TARGET}
     PREFIX ${PROTOBUF_TARGET}
     GIT_REPOSITORY https://github.com/google/protobuf.git
-    GIT_TAG 1363bf9c051af36c555c23d734a204246c215697
+    GIT_TAG 204f99488ce1ef74565239cf3963111ae4c774b7
     UPDATE_COMMAND ""
     CONFIGURE_COMMAND ${CMAKE_COMMAND} ${PROTOBUF_INSTALL_DIR}/src/${PROTOBUF_TARGET}/cmake
         -G${CMAKE_GENERATOR}

src/mutator_test.cc

diff --git a/src/mutator_test.cc b/src/mutator_test.cc
index 3e54cea..312b2d9 100644
--- a/src/mutator_test.cc
+++ b/src/mutator_test.cc
@@ -678,8 +678,8 @@
 
 TYPED_TEST(MutatorTypedTest, UnknownFieldTextFormat) {
   typename TestFixture::Message parsed;
-  EXPECT_FALSE(ParseTextMessage(kUnknownFieldInput, &parsed));
-  EXPECT_NE(SaveMessageAsText(parsed), kUnknownFieldExpected);
+  EXPECT_TRUE(ParseTextMessage(kUnknownFieldInput, &parsed));
+  EXPECT_EQ(SaveMessageAsText(parsed), kUnknownFieldExpected);
 }
 
 TYPED_TEST(MutatorTypedTest, DeepRecursion) {

src/text_format.cc

diff --git a/src/text_format.cc b/src/text_format.cc
index fae6f6e..4479229 100644
--- a/src/text_format.cc
+++ b/src/text_format.cc
@@ -30,7 +30,7 @@
   TextFormat::Parser parser;
   parser.SetRecursionLimit(100);
   parser.AllowPartialMessage(true);
-  // parser.AllowUnknownField(true);
+  parser.AllowUnknownField(true);
   if (!parser.ParseFromString(data, output)) {
     output->Clear();
     return false;