On platforms without a file system, don't log an error when no

derekmauro · copybara-github · commit 2acd53824402 · 2023-06-27T20:47:07.000-07:00
alternative output format is requested. Fixes #4299 PiperOrigin-RevId: 543932266 Change-Id: Ide78c313ecf6829e4910f4a8407275c81edb3848
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
@@ -5655,8 +5655,10 @@ void UnitTestImpl::ConfigureXmlOutput() {
                         << output_format << "\" ignored.";
   }
 #else
-  GTEST_LOG_(ERROR) << "ERROR: alternative output formats require "
-                    << "GTEST_HAS_FILE_SYSTEM to be enabled";
+  if (!output_format.empty()) {
+    GTEST_LOG_(ERROR) << "ERROR: alternative output formats require "
+                      << "GTEST_HAS_FILE_SYSTEM to be enabled";
+  }
 #endif  // GTEST_HAS_FILE_SYSTEM
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5655,8 +5655,10 @@ void UnitTestImpl::ConfigureXmlOutput() {`
`5655`	`5655`	`<< output_format << "\" ignored.";`
`5656`	`5656`	`}`
`5657`	`5657`	`#else`
`5658`		`- GTEST_LOG_(ERROR) << "ERROR: alternative output formats require "`
`5659`		`- << "GTEST_HAS_FILE_SYSTEM to be enabled";`
	`5658`	`+ if (!output_format.empty()) {`
	`5659`	`+ GTEST_LOG_(ERROR) << "ERROR: alternative output formats require "`
	`5660`	`+ << "GTEST_HAS_FILE_SYSTEM to be enabled";`
	`5661`	`+ }`
`5660`	`5662`	`#endif // GTEST_HAS_FILE_SYSTEM`
`5661`	`5663`	`}`
`5662`	`5664`