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-port.cc | |
parent | 691e38e518336fa8a9b51915735fe869edb24c08 (diff) | |
download | googletest-0f6567954f42767e2f4a92d9f3b4afa679a65c16.zip googletest-0f6567954f42767e2f4a92d9f3b4afa679a65c16.tar.gz googletest-0f6567954f42767e2f4a92d9f3b4afa679a65c16.tar.bz2 |
more merges
Diffstat (limited to 'googletest/src/gtest-port.cc')
-rw-r--r-- | googletest/src/gtest-port.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/src/gtest-port.cc b/googletest/src/gtest-port.cc index ffea9b3..e710354 100644 --- a/googletest/src/gtest-port.cc +++ b/googletest/src/gtest-port.cc @@ -1228,7 +1228,7 @@ Int32 Int32FromGTestEnv(const char* flag, Int32 default_value) { // not check that the flag is 'output' // In essence this checks env. variable called XML_OUTPUT_FILE // if it is set we prepend "xml:" to its value , if it not set we return "" -std::string SpecialCase_Output_Flag_XML_OUTPUT_FILE_Env(){ +std::string OutputFlagAlsoCheckEnvVar(){ std::string default_value_for_output_flag = ""; const char* xml_output_file_env = posix::GetEnv("XML_OUTPUT_FILE"); if (NULL != xml_output_file_env) { |