diff --git a/absl/flags/usage_config.cc b/absl/flags/usage_config.cc index bbc020d1..6e8830b1 100644 --- a/absl/flags/usage_config.cc +++ b/absl/flags/usage_config.cc @@ -53,15 +53,10 @@ namespace { bool ContainsHelpshortFlags(absl::string_view filename) { // By default we only want flags in binary's main. We expect the main // routine to reside in .cc or -main.cc or - // _main.cc, where the is the name of the binary - // (without .exe on Windows). + // _main.cc, where the is the name of the binary. auto suffix = flags_internal::Basename(filename); - auto program_name = flags_internal::ShortProgramInvocationName(); - absl::string_view program_name_ref = program_name; -#if defined(_WIN32) - absl::ConsumeSuffix(&program_name_ref, ".exe"); -#endif - if (!absl::ConsumePrefix(&suffix, program_name_ref)) + if (!absl::ConsumePrefix(&suffix, + flags_internal::ShortProgramInvocationName())) return false; return absl::StartsWith(suffix, ".") || absl::StartsWith(suffix, "-main.") || absl::StartsWith(suffix, "_main."); diff --git a/absl/flags/usage_config_test.cc b/absl/flags/usage_config_test.cc index e57a8832..70eca30b 100644 --- a/absl/flags/usage_config_test.cc +++ b/absl/flags/usage_config_test.cc @@ -84,11 +84,7 @@ TEST_F(FlagsUsageConfigTest, TestGetSetFlagsUsageConfig) { // -------------------------------------------------------------------- TEST_F(FlagsUsageConfigTest, TestContainsHelpshortFlags) { -#if defined(_WIN32) - flags::SetProgramInvocationName("usage_config_test.exe"); -#else flags::SetProgramInvocationName("usage_config_test"); -#endif auto config = flags::GetUsageConfig(); EXPECT_TRUE(config.contains_helpshort_flags("adir/cd/usage_config_test.cc"));