diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-03-22 14:56:35 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-03-22 14:56:35 (GMT) |
| commit | 0f6567954f42767e2f4a92d9f3b4afa679a65c16 (patch) | |
| tree | 1ff54fc4be37e36266e39f9dfe9b075fae6c96dd /googletest/src/gtest.cc | |
| parent | 691e38e518336fa8a9b51915735fe869edb24c08 (diff) | |
| download | googletest-0f6567954f42767e2f4a92d9f3b4afa679a65c16.zip googletest-0f6567954f42767e2f4a92d9f3b4afa679a65c16.tar.gz googletest-0f6567954f42767e2f4a92d9f3b4afa679a65c16.tar.bz2 | |
more merges
Diffstat (limited to 'googletest/src/gtest.cc')
| -rw-r--r-- | googletest/src/gtest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 07fedd7..9079af8 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -238,7 +238,7 @@ GTEST_DEFINE_bool_(list_tests, false, GTEST_DEFINE_string_( output, internal::StringFromGTestEnv("output", - internal::SpecialCase_Output_Flag_XML_OUTPUT_FILE_Env().c_str()), + internal::OutputFlagAlsoCheckEnvVar().c_str()), "A format (defaults to \"xml\" but can be specified to be \"json\"), " "optionally followed by a colon and an output file name or directory. " "A directory is indicated by a trailing pathname separator. " |