1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
Description: fix C++ build tests
Add bits to expect 32 bit systems.
Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
Bug-Debian: https://bugs.debian.org/1033998
Forwarded: no
Last-Update: 2023-12-26
---
--- a/src/google/protobuf/any_test.cc
+++ b/src/google/protobuf/any_test.cc
@@ -44,9 +44,14 @@ TEST(AnyTest, TestPackFromSerializationE
GTEST_SKIP() << "This toolchain can't allocate that much memory.";
#endif
protobuf_unittest::TestAny submessage;
- submessage.mutable_text()->resize(INT_MAX, 'a');
protobuf_unittest::TestAny message;
- EXPECT_FALSE(message.mutable_any_value()->PackFrom(submessage));
+ try {
+ submessage.mutable_text()->resize(INT_MAX, 'a');
+ EXPECT_FALSE(message.mutable_any_value()->PackFrom(submessage));
+ }
+ catch (...) {
+ EXPECT_TRUE(message.mutable_any_value()->PackFrom(submessage));
+ }
}
TEST(AnyTest, TestUnpackWithTypeMismatch) {
--- a/src/google/protobuf/arena_unittest.cc
+++ b/src/google/protobuf/arena_unittest.cc
@@ -1369,11 +1369,11 @@ TEST(ArenaTest, SpaceAllocated_and_Used)
options.initial_block_size = arena_block.size();
Arena arena_2(options);
EXPECT_EQ(1024, arena_2.SpaceAllocated());
- EXPECT_EQ(0, arena_2.SpaceUsed());
+ EXPECT_EQ(8 - sizeof(void*), arena_2.SpaceUsed());
EXPECT_EQ(1024, arena_2.Reset());
Arena::CreateArray<char>(&arena_2, 55);
EXPECT_EQ(1024, arena_2.SpaceAllocated());
- EXPECT_EQ(Align8(55), arena_2.SpaceUsed());
+ EXPECT_EQ(Align8(55) + 8 - sizeof(void*), arena_2.SpaceUsed());
EXPECT_EQ(1024, arena_2.Reset());
}
@@ -1437,11 +1437,11 @@ TEST(ArenaTest, BlockSizeSmallerThanAllo
*Arena::Create<int64_t>(&arena) = 42;
EXPECT_GE(arena.SpaceAllocated(), 8);
- EXPECT_EQ(8, arena.SpaceUsed());
+ EXPECT_EQ(16 - sizeof(void*), arena.SpaceUsed());
*Arena::Create<int64_t>(&arena) = 42;
EXPECT_GE(arena.SpaceAllocated(), 16);
- EXPECT_EQ(16, arena.SpaceUsed());
+ EXPECT_EQ(24 - sizeof(void*), arena.SpaceUsed());
}
}
|
