coffee/googletest
1
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2026-10-28 18:07:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move flagfile_value into a ParseFlagFileFlag helper to fix -Wunused-variable warning.

Browse Source 
PiperOrigin-RevId: 1004210529
Change-Id: I415314113263122b84b68c0abe7afdb20f97aff6
This commit is contained in:
Anshul Nigham 2026-10-21 13:57:46 -07:00 committed by Copybara-Service
parent b66cffcd5f
commit cd8e73f067
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
googletest/src/gtest.cc
View File

@ -6857,6 +6857,16 @@ static void LoadFlagsFromFile(const std::string& path) {
if (!ParseGoogleTestFlag(lines[i].c_str())) g_help_flag = true; if (!ParseGoogleTestFlag(lines[i].c_str())) g_help_flag = true;
} }
} }
static bool ParseFlagFileFlag(const char* const arg) {
std::string flagfile_value;
if (!ParseFlag(arg, "flagfile", &flagfile_value)) {
return false;
}
GTEST_FLAG_SET(flagfile, flagfile_value);
LoadFlagsFromFile(flagfile_value);
return true;
}
#endif // GTEST_USE_OWN_FLAGFILE_FLAG_ && GTEST_HAS_FILE_SYSTEM #endif // GTEST_USE_OWN_FLAGFILE_FLAG_ && GTEST_HAS_FILE_SYSTEM
// Parses the command line for Google Test flags, without initializing // Parses the command line for Google Test flags, without initializing
@ -6864,7 +6874,6 @@ static void LoadFlagsFromFile(const std::string& path) {
// instantiated to either char or wchar_t. // instantiated to either char or wchar_t.
template <typename CharType> template <typename CharType>
void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) { void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
std::string flagfile_value;
for (int i = 1; i < *argc; i++) { for (int i = 1; i < *argc; i++) {
const std::string arg_string = StreamableToString(argv[i]); const std::string arg_string = StreamableToString(argv[i]);
const char* const arg = arg_string.c_str(); const char* const arg = arg_string.c_str();
@ -6875,9 +6884,7 @@ void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
if (ParseGoogleTestFlag(arg)) { if (ParseGoogleTestFlag(arg)) {
remove_flag = true; remove_flag = true;
#if GTEST_USE_OWN_FLAGFILE_FLAG_ && GTEST_HAS_FILE_SYSTEM #if GTEST_USE_OWN_FLAGFILE_FLAG_ && GTEST_HAS_FILE_SYSTEM
} else if (ParseFlag(arg, "flagfile", &flagfile_value)) { } else if (ParseFlagFileFlag(arg)) {
GTEST_FLAG_SET(flagfile, 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 (arg_string == "--help" || HasGoogleTestFlagPrefix(arg)) {