Makes gtest compile cleanly with MSVC's /W4 (by Zhanyong Wan).
Renames EventListenrs to TestEventListeners (by Zhanyong Wan). Fixes invalid characters in XML report (by Vlad Losev). Refacotrs SConscript (by Vlad Losev).
This commit is contained in:
@@ -64,14 +64,14 @@ namespace {
|
||||
do {\
|
||||
const int expected_val = (expected);\
|
||||
const int actual_val = (actual);\
|
||||
if (expected_val != actual_val) {\
|
||||
if (::testing::internal::IsTrue(expected_val != actual_val)) {\
|
||||
::std::cout << "Value of: " #actual "\n"\
|
||||
<< " Actual: " << actual_val << "\n"\
|
||||
<< "Expected: " #expected "\n"\
|
||||
<< "Which is: " << expected_val << "\n";\
|
||||
abort();\
|
||||
}\
|
||||
} while(false)
|
||||
} while(::testing::internal::AlwaysFalse())
|
||||
|
||||
|
||||
// Used for verifying that global environment set-up and tear-down are
|
||||
|
||||
Reference in New Issue
Block a user