eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Googletest export

Browse Source 
Build gmock cleanly with clang -Wextra-semi and -Wextra-semi-stmt

Extends 56ef07a203 to take -Wc++98-compat-extra-semi
(https://reviews.llvm.org/D43162) and -Wextra-semi-stmt
(https://reviews.llvm.org/D52695) into account.

For https://crbug.com/926235.

PiperOrigin-RevId: 236643095
This commit is contained in:
Abseil Team 2019-03-04 09:38:02 -05:00 committed by Gennadiy Civil
parent db9b85e275
commit a1dd07786b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
googlemock/test/gmock-internal-utils_test.cc
View File

@ -558,7 +558,7 @@ void ExpectCallLogger() {
DummyMock mock; DummyMock mock;
EXPECT_CALL(mock, TestMethod()); EXPECT_CALL(mock, TestMethod());
mock.TestMethod(); mock.TestMethod();
}; }
// Verifies that EXPECT_CALL logs if the --gmock_verbose flag is set to "info". // Verifies that EXPECT_CALL logs if the --gmock_verbose flag is set to "info".
TEST(ExpectCallTest, LogsWhenVerbosityIsInfo) { TEST(ExpectCallTest, LogsWhenVerbosityIsInfo) {
@ -581,7 +581,7 @@ TEST(ExpectCallTest, DoesNotLogWhenVerbosityIsError) {
void OnCallLogger() { void OnCallLogger() {
DummyMock mock; DummyMock mock;
ON_CALL(mock, TestMethod()); ON_CALL(mock, TestMethod());
}; }
// Verifies that ON_CALL logs if the --gmock_verbose flag is set to "info". // Verifies that ON_CALL logs if the --gmock_verbose flag is set to "info".
TEST(OnCallTest, LogsWhenVerbosityIsInfo) { TEST(OnCallTest, LogsWhenVerbosityIsInfo) {

2
googletest/src/gtest.cc
View File

@ -2970,7 +2970,7 @@ static const char* GetAnsiColorCode(GTestColor color) {
case COLOR_YELLOW: return "3"; case COLOR_YELLOW: return "3";
default: default:
return nullptr; return nullptr;
}; }
} }
#endif // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE #endif // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE