diff options
| author | Yonggang Luo <luoyonggang@gmail.com> | 2022-11-24 15:54:19 (GMT) |
|---|---|---|
| committer | Yonggang Luo <luoyonggang@gmail.com> | 2023-02-28 16:13:32 (GMT) |
| commit | 6f1c4b3d7b139c7217698bf4115be9f40785f661 (patch) | |
| tree | 32bbb2bec79d733bf34f3b258d8ab2db4bc92163 /googletest/test | |
| parent | 097f64e98693500d44d022a781745e562aa492ad (diff) | |
| download | googletest-6f1c4b3d7b139c7217698bf4115be9f40785f661.zip googletest-6f1c4b3d7b139c7217698bf4115be9f40785f661.tar.gz googletest-6f1c4b3d7b139c7217698bf4115be9f40785f661.tar.bz2 | |
Fixes the test gmock_output_test.py with MSVC
For MSVC, gmock_output_test.py output struct std::pair<int,bool>, for GCC, it's output
std::pair<int, bool>, it's not the same, my intention is getting these to be same by removing
struct for MSVC's outptu, and strip redundant space for GCC.
As a by-product,
```
#ifdef _MSC_VER
#define ERROR_DESC "class std::runtime_error"
#else
#define ERROR_DESC "std::runtime_error"
#endif
```
can be simplified to
```
#define ERROR_DESC "std::runtime_error"
```
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Diffstat (limited to 'googletest/test')
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index ecffa37..180c3ab 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -3314,11 +3314,7 @@ TEST_F(SingleEvaluationTest, OtherCases) { #if GTEST_HAS_RTTI -#ifdef _MSC_VER -#define ERROR_DESC "class std::runtime_error" -#else #define ERROR_DESC "std::runtime_error" -#endif #else // GTEST_HAS_RTTI |