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 /googlemock/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 'googlemock/test')
| -rw-r--r-- | googlemock/test/gmock_output_test_golden.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/test/gmock_output_test_golden.txt b/googlemock/test/gmock_output_test_golden.txt index 467fa20..9a7adf6 100644 --- a/googlemock/test/gmock_output_test_golden.txt +++ b/googlemock/test/gmock_output_test_golden.txt @@ -292,7 +292,7 @@ Stack trace: FILE:#: Failure Value of: (std::pair<int, bool>(42, true)) Expected: is pair (first: is >= 48, second: true) - Actual: (42, true) (of type std::pair<int, bool>) + Actual: (42, true) (of type std::pair<int,bool>) [ FAILED ] GMockOutputTest.PrintsMatcher [ FAILED ] GMockOutputTest.UnexpectedCall [ FAILED ] GMockOutputTest.UnexpectedCallToVoidFunction |