Update to 3.14.0

This commit is contained in:
Adrian Reber 2021-01-12 12:31:01 +01:00
parent b888e7357d
commit 21c6d24bb0
No known key found for this signature in database
GPG Key ID: 82C9378ED3C4906A
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,25 @@
--- a/src/google/protobuf/io/zero_copy_stream_unittest.cc.orig 2021-01-12 12:25:18.471517830 +0100
+++ b/src/google/protobuf/io/zero_copy_stream_unittest.cc 2021-01-12 12:25:42.022696126 +0100
@@ -712,22 +712,6 @@
}
}
-// Verifies that outputs up to kint32max can be created.
-TEST_F(IoTest, LargeOutput) {
- std::string str;
- StringOutputStream output(&str);
- void* unused_data;
- int size;
- // Repeatedly calling Next should eventually grow the buffer to kint32max.
- do {
- EXPECT_TRUE(output.Next(&unused_data, &size));
- } while (str.size() < std::numeric_limits<int>::max());
- // Further increases should be possible.
- output.Next(&unused_data, &size);
- EXPECT_GT(size, 0);
-}
-
-
// To test files, we create a temporary file, write, read, truncate, repeat.
TEST_F(IoTest, FileIo) {
std::string filename = TestTempDir() + "/zero_copy_stream_test_file";

View File

@ -17,6 +17,9 @@ Source2: protobuf-init.el
# For tests (using exactly the same version as the release)
Source3: https://github.com/google/googletest/archive/5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081.zip
# https://github.com/protocolbuffers/protobuf/issues/8082
Patch1: protobuf-3.14-disable-IoTest.LargeOutput.patch
BuildRequires: make
BuildRequires: autoconf
BuildRequires: automake
@ -190,7 +193,11 @@ Protocol Buffer BOM POM.
%prep
%setup -q -n %{name}-%{version}%{?rcver} -a 3
%autopatch -p1
%ifarch %{ix86} armv7hl
# IoTest.LargeOutput fails on 32bit arches
# https://github.com/protocolbuffers/protobuf/issues/8082
%patch1 -p1
%endif
mv googletest-5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081/* third_party/googletest/
find -name \*.cc -o -name \*.h | xargs chmod -x
chmod 644 examples/*