diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-03-22 10:56:35 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-03-22 10:56:35 -0400 |
| commit | 0f6567954f42767e2f4a92d9f3b4afa679a65c16 (patch) | |
| tree | 1ff54fc4be37e36266e39f9dfe9b075fae6c96dd | |
| parent | 691e38e518336fa8a9b51915735fe869edb24c08 (diff) | |
| download | googletest-0f6567954f42767e2f4a92d9f3b4afa679a65c16.tar.gz googletest-0f6567954f42767e2f4a92d9f3b4afa679a65c16.tar.bz2 googletest-0f6567954f42767e2f4a92d9f3b4afa679a65c16.zip | |
more merges
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 2 | ||||
| -rw-r--r-- | googletest/src/gtest-port.cc | 2 | ||||
| -rw-r--r-- | googletest/src/gtest.cc | 2 | ||||
| -rwxr-xr-x | googletest/test/gtest_list_tests_unittest.py | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 53c1b5f4..751e1764 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -2675,7 +2675,7 @@ bool ParseInt32(const Message& src_text, const char* str, Int32* value); // corresponding to the given Google Test flag. bool BoolFromGTestEnv(const char* flag, bool default_val); GTEST_API_ Int32 Int32FromGTestEnv(const char* flag, Int32 default_val); -std::string SpecialCase_Output_Flag_XML_OUTPUT_FILE_Env(); +std::string OutputFlagAlsoCheckEnvVar(); const char* StringFromGTestEnv(const char* flag, const char* default_val); } // namespace internal diff --git a/googletest/src/gtest-port.cc b/googletest/src/gtest-port.cc index ffea9b32..e710354a 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) { diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 07fedd7e..9079af8d 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. " diff --git a/googletest/test/gtest_list_tests_unittest.py b/googletest/test/gtest_list_tests_unittest.py index ebf1a3c9..0844f98a 100755 --- a/googletest/test/gtest_list_tests_unittest.py +++ b/googletest/test/gtest_list_tests_unittest.py @@ -70,7 +70,7 @@ FooTest\. TypedTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\. TestA TestB -TypedTest/1\. # TypeParam = int\s*\*( __ptr64)? +TypedTest/1\. # TypeParam = int\s*\* TestA TestB TypedTest/2\. # TypeParam = .*MyArray<bool,\s*42> @@ -79,7 +79,7 @@ TypedTest/2\. # TypeParam = .*MyArray<bool,\s*42> My/TypeParamTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\. TestA TestB -My/TypeParamTest/1\. # TypeParam = int\s*\*( __ptr64)? +My/TypeParamTest/1\. # TypeParam = int\s*\* TestA TestB My/TypeParamTest/2\. # TypeParam = .*MyArray<bool,\s*42> |