AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Disable death tests on windows

Browse Source 
Also remove cord related code
This commit is contained in:
Jisi Liu 2017-08-22 12:59:32 -07:00
parent e416f5d2d3
commit 6609e52124
2 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/google/protobuf/message_unittest.cc
View File

@ -257,44 +257,6 @@ TEST(MessageTest, CheckInitialized) {
"fields: a, b, c");
}
TEST(MessageTest, CheckOverflow) {
unittest::TestAllTypes message;
// Create a message with size just over 2GB. This triggers integer overflow
// when computing message size.
const string data(1024, 'x');
Cord one_megabyte;
for (int i = 0; i < 1024; i++) {
one_megabyte.Append(data);
}
for (int i = 0; i < 2 * 1024 + 1; ++i) {
message.add_repeated_cord()->CopyFrom(one_megabyte);
}
Cord serialized;
EXPECT_FALSE(message.AppendToCord(&serialized));
}
TEST(MessageTest, CheckBigOverflow) {
// Checking for 4GB buffers on 32 bit systems is problematic.
if (sizeof(void*) < 8) return;
unittest::TestAllTypes message;
// Create a message with size just over 4GB. We should be able to detect this
// too, even though it will make a plain "int" wrap back to a positive number.
const string data(1024, 'x');
Cord one_megabyte;
for (int i = 0; i < 1024; i++) {
one_megabyte.Append(data);
}
for (int i = 0; i < 4 * 1024 + 1; ++i) {
message.add_repeated_cord()->CopyFrom(one_megabyte);
}
Cord serialized;
EXPECT_FALSE(message.AppendToCord(&serialized));
}
#endif // PROTOBUF_HAS_DEATH_TEST
namespace {

3
src/google/protobuf/testing/googletest.h
View File

@ -39,7 +39,8 @@
#include <google/protobuf/stubs/common.h>
#include <gmock/gmock.h>
// Disable death tests if we use exceptions in CHECK().
#if !PROTOBUF_USE_EXCEPTIONS && defined(GTEST_HAS_DEATH_TEST)
#if !PROTOBUF_USE_EXCEPTIONS && defined(GTEST_HAS_DEATH_TEST) && \
!GTEST_OS_WINDOWS
#define PROTOBUF_HAS_DEATH_TEST
#endif