diff options
author | Gennadiy Civil <misterg@google.com> | 2018-03-21 20:31:31 (GMT) |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2018-03-21 20:31:31 (GMT) |
commit | 691e38e518336fa8a9b51915735fe869edb24c08 (patch) | |
tree | ec9d6829582161e3c89b7f31a85b183da463058c /googletest/src/gtest.cc | |
parent | dccc2d67547a5a3a97e4f211f39df931c6fbd5d5 (diff) | |
download | googletest-691e38e518336fa8a9b51915735fe869edb24c08.zip googletest-691e38e518336fa8a9b51915735fe869edb24c08.tar.gz googletest-691e38e518336fa8a9b51915735fe869edb24c08.tar.bz2 |
More merges
Diffstat (limited to 'googletest/src/gtest.cc')
-rw-r--r-- | googletest/src/gtest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index d22679f..07fedd7 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -230,9 +230,15 @@ GTEST_DEFINE_string_( GTEST_DEFINE_bool_(list_tests, false, "List all tests without running them."); +// The net priority order after flag processing is thus: +// --gtest_output command line flag +// GTEST_OUTPUT environment variable +// XML_OUTPUT_FILE environment variable +// '' GTEST_DEFINE_string_( output, - internal::StringFromGTestEnv("output", ""), + internal::StringFromGTestEnv("output", + internal::SpecialCase_Output_Flag_XML_OUTPUT_FILE_Env().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. " |