gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'original/master' into readme-update-with-opensource-proj

Browse Source
This commit is contained in:
Mate Pek 2020-05-19 23:33:05 +07:00
commit 73fdce3b6e
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
googlemock/docs/community_created_documentation.md Normal file
View File

@ -0,0 +1,9 @@
# Community-Created Documentation
go/gunit-community-created-docs
The following is a list, in no particular order, of links to documentation
created by the Googletest community.
* [Googlemock Insights](https://github.com/ElectricRCAircraftGuy/eRCaGuy_dotfiles/blob/master/googletest/insights.md),
by [ElectricRCAircraftGuy](https://github.com/ElectricRCAircraftGuy)

3
googletest/docs/advanced.md
View File

@ -2288,8 +2288,7 @@ environment variable to `0`.
googletest can emit a detailed XML report to a file in addition to its normal googletest can emit a detailed XML report to a file in addition to its normal
textual output. The report contains the duration of each test, and thus can help textual output. The report contains the duration of each test, and thus can help
you identify slow tests. The report is also used by the http://unittest you identify slow tests.
dashboard to show per-test-method error messages.
To generate the XML report, set the `GTEST_OUTPUT` environment variable or the To generate the XML report, set the `GTEST_OUTPUT` environment variable or the
`--gtest_output` flag to the string `"xml:path_to_output_file"`, which will `--gtest_output` flag to the string `"xml:path_to_output_file"`, which will

7
googletest/include/gtest/internal/gtest-internal.h
View File

@ -1283,8 +1283,13 @@ constexpr bool InstantiateTypedTestCase_P_IsDeprecated() { return true; }
// Suppress MSVC warning 4072 (unreachable code) for the code following // Suppress MSVC warning 4072 (unreachable code) for the code following
// statement if it returns or throws (or doesn't return or throw in some // statement if it returns or throws (or doesn't return or throw in some
// situations). // situations).
// NOTE: The "else" is important to keep this expansion to prevent a top-level
// "else" from attaching to our "if".
#define GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) \ #define GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) \
if (::testing::internal::AlwaysTrue()) { statement; } if (::testing::internal::AlwaysTrue()) { \
statement; \
} else /* NOLINT */ \
static_assert(true, "") // User must have a semicolon after expansion.
#define GTEST_TEST_THROW_(statement, expected_exception, fail) \ #define GTEST_TEST_THROW_(statement, expected_exception, fail) \
GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ GTEST_AMBIGUOUS_ELSE_BLOCKER_ \

6
googletest/src/gtest.cc
View File

@ -81,13 +81,11 @@
#elif GTEST_OS_WINDOWS // We are on Windows proper. #elif GTEST_OS_WINDOWS // We are on Windows proper.
# include <Windows.h> // NOLINT
# include <windows.h> // NOLINT # include <windows.h> // NOLINT
# undef min # undef min
#ifdef _MSC_VER #ifdef _MSC_VER
# include <crtdbg.h> // NOLINT # include <crtdbg.h> // NOLINT
# include <debugapi.h> // NOLINT
#endif #endif
# include <io.h> // NOLINT # include <io.h> // NOLINT
@ -6290,10 +6288,10 @@ static const char kColorEncodedHelpMessage[] =
" @G--" GTEST_FLAG_PREFIX_ " @G--" GTEST_FLAG_PREFIX_
"color=@Y(@Gyes@Y|@Gno@Y|@Gauto@Y)@D\n" "color=@Y(@Gyes@Y|@Gno@Y|@Gauto@Y)@D\n"
" Enable/disable colored output. The default is @Gauto@D.\n" " Enable/disable colored output. The default is @Gauto@D.\n"
" -@G-" GTEST_FLAG_PREFIX_ " @G--" GTEST_FLAG_PREFIX_
"brief=1@D\n" "brief=1@D\n"
" Only print test failures.\n" " Only print test failures.\n"
" -@G-" GTEST_FLAG_PREFIX_ " @G--" GTEST_FLAG_PREFIX_
"print_time=0@D\n" "print_time=0@D\n"
" Don't print the elapsed time of each test.\n" " Don't print the elapsed time of each test.\n"
" @G--" GTEST_FLAG_PREFIX_ " @G--" GTEST_FLAG_PREFIX_