summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-03-22 14:56:35 (GMT)
committerGennadiy Civil <misterg@google.com>2018-03-22 14:56:35 (GMT)
commit0f6567954f42767e2f4a92d9f3b4afa679a65c16 (patch)
tree1ff54fc4be37e36266e39f9dfe9b075fae6c96dd
parent691e38e518336fa8a9b51915735fe869edb24c08 (diff)
downloadgoogletest-0f6567954f42767e2f4a92d9f3b4afa679a65c16.zip
googletest-0f6567954f42767e2f4a92d9f3b4afa679a65c16.tar.gz
googletest-0f6567954f42767e2f4a92d9f3b4afa679a65c16.tar.bz2
more merges
-rw-r--r--googletest/include/gtest/internal/gtest-port.h2
-rw-r--r--googletest/src/gtest-port.cc2
-rw-r--r--googletest/src/gtest.cc2
-rwxr-xr-xgoogletest/test/gtest_list_tests_unittest.py4
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 53c1b5f..751e176 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 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) {
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. "
diff --git a/googletest/test/gtest_list_tests_unittest.py b/googletest/test/gtest_list_tests_unittest.py
index ebf1a3c..0844f98 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>