gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more merges

Browse Source
This commit is contained in:
Gennadiy Civil 2018-03-22 10:56:35 -04:00
parent 691e38e518
commit 0f6567954f
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
googletest/include/gtest/internal/gtest-port.h
View File

@ -2675,7 +2675,7 @@ bool ParseInt32(const Message& src_text, const char* str, Int32* value);
// corresponding to the given Google Test flag. // corresponding to the given Google Test flag.
bool BoolFromGTestEnv(const char* flag, bool default_val); bool BoolFromGTestEnv(const char* flag, bool default_val);
GTEST_API_ Int32 Int32FromGTestEnv(const char* flag, Int32 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); const char* StringFromGTestEnv(const char* flag, const char* default_val);
} // namespace internal } // namespace internal

2
googletest/src/gtest-port.cc
View File

@ -1228,7 +1228,7 @@ Int32 Int32FromGTestEnv(const char* flag, Int32 default_value) {
// not check that the flag is 'output' // not check that the flag is 'output'
// In essence this checks env. variable called XML_OUTPUT_FILE // 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 "" // 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 = ""; std::string default_value_for_output_flag = "";
const char* xml_output_file_env = posix::GetEnv("XML_OUTPUT_FILE"); const char* xml_output_file_env = posix::GetEnv("XML_OUTPUT_FILE");
if (NULL != xml_output_file_env) { if (NULL != xml_output_file_env) {

2
googletest/src/gtest.cc
View File

@ -238,7 +238,7 @@ GTEST_DEFINE_bool_(list_tests, false,
GTEST_DEFINE_string_( GTEST_DEFINE_string_(
output, output,
internal::StringFromGTestEnv("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\"), " "A format (defaults to \"xml\" but can be specified to be \"json\"), "
"optionally followed by a colon and an output file name or directory. " "optionally followed by a colon and an output file name or directory. "
"A directory is indicated by a trailing pathname separator. " "A directory is indicated by a trailing pathname separator. "

4
googletest/test/gtest_list_tests_unittest.py
View File

@ -70,7 +70,7 @@ FooTest\.
TypedTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\. TypedTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\.
TestA TestA
TestB TestB
TypedTest/1\. # TypeParam = int\s*\*( __ptr64)? TypedTest/1\. # TypeParam = int\s*\*
TestA TestA
TestB TestB
TypedTest/2\. # TypeParam = .*MyArray<bool,\s*42> 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})\.\.\. My/TypeParamTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\.
TestA TestA
TestB TestB
My/TypeParamTest/1\. # TypeParam = int\s*\*( __ptr64)? My/TypeParamTest/1\. # TypeParam = int\s*\*
TestA TestA
TestB TestB
My/TypeParamTest/2\. # TypeParam = .*MyArray<bool,\s*42> My/TypeParamTest/2\. # TypeParam = .*MyArray<bool,\s*42>