2 files changed, 30 insertions, 1 deletions
diff --git a/Firestore/core/test/firebase/firestore/util/CMakeLists.txt b/Firestore/core/test/firebase/firestore/util/CMakeLists.txt
index ae2c3b0..42c4dcc 100644
--- a/Firestore/core/test/firebase/firestore/util/CMakeLists.txt
+++ b/Firestore/core/test/firebase/firestore/util/CMakeLists.txt
@@ -15,10 +15,29 @@
 cc_test(
   firebase_firestore_util_test
   autoid_test.cc
-  log_test.cc
   secure_random_test.cc
 )
 target_link_libraries(
   firebase_firestore_util_test
   firebase_firestore_util
 )
+
+if(APPLE)
+  cc_test(
+    firebase_firestore_util_log_apple_test
+    log_test.cc
+  )
+  target_link_libraries(
+    firebase_firestore_util_log_apple_test
+    firebase_firestore_util_log_apple
+  )
+endif(APPLE)
+
+cc_test(
+  firebase_firestore_util_log_stdio_test
+  log_test.cc
+)
+target_link_libraries(
+  firebase_firestore_util_log_stdio_test
+  firebase_firestore_util_log_stdio
+)
diff --git a/Firestore/core/test/firebase/firestore/util/log_test.cc b/Firestore/core/test/firebase/firestore/util/log_test.cc
index 09b2c08..46cbc4e 100644
--- a/Firestore/core/test/firebase/firestore/util/log_test.cc
+++ b/Firestore/core/test/firebase/firestore/util/log_test.cc
@@ -22,6 +22,16 @@ namespace firebase {
 namespace firestore {
 namespace util {
 
+// When running against the log_apple.mm implementation (backed by FIRLogger)
+// this test can fail if debug_mode gets persisted in the user defaults. Check
+// for defaults getting in your way with
+//
+//   defaults read firebase_firestore_util_log_apple_test
+//
+// You can fix it with:
+//
+//   defaults write firebase_firestore_util_log_apple_test \
+//       /google/firebase/debug_mode NO
 TEST(Log, SetAndGet) {
   LogSetLevel(kLogLevelVerbose);