coffee/googletest
1
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-12-06 16:57:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add support for all help flag variants mentioned in the documentation

Browse Source 
The documentation specifies that '-h', '-?', and '/?' may be used, but
the code failed to check for these flags. This commit fixes the behavior
of the executable to match what is specified in the docs.
This commit is contained in:
Alecto Irene Perez 2024-06-24 13:52:15 -04:00
parent 1d17ea141d
commit bbd5c3a4b8
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
googletest/src/gtest.cc
View File

@ -6672,6 +6672,12 @@ static void LoadFlagsFromFile(const std::string& path) {
} }
#endif // GTEST_USE_OWN_FLAGFILE_FLAG_ && GTEST_HAS_FILE_SYSTEM #endif // GTEST_USE_OWN_FLAGFILE_FLAG_ && GTEST_HAS_FILE_SYSTEM
// Checks if the given flag is a help flag.
// Support all help flag variants mentioned in the documentation.
static bool IsHelpFlag(const std::string& flag) {
return flag == "--help" || flag == "-h" || flag == "-?" || flag == "/?";
}
// Parses the command line for Google Test flags, without initializing // Parses the command line for Google Test flags, without initializing
// other parts of Google Test. The type parameter CharType can be // other parts of Google Test. The type parameter CharType can be
// instantiated to either char or wchar_t. // instantiated to either char or wchar_t.
@ -6693,7 +6699,7 @@ void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
LoadFlagsFromFile(flagfile_value); LoadFlagsFromFile(flagfile_value);
remove_flag = true; remove_flag = true;
#endif // GTEST_USE_OWN_FLAGFILE_FLAG_ && GTEST_HAS_FILE_SYSTEM #endif // GTEST_USE_OWN_FLAGFILE_FLAG_ && GTEST_HAS_FILE_SYSTEM
} else if (arg_string == "--help" || HasGoogleTestFlagPrefix(arg)) { } else if (IsHelpFlag(arg_string) || HasGoogleTestFlagPrefix(arg)) {
// Both help flag and unrecognized Google Test flags (excluding // Both help flag and unrecognized Google Test flags (excluding
// internal ones) trigger help display. // internal ones) trigger help display.
g_help_flag = true; g_help_flag = true;