diff options
author | Gil <mcg@google.com> | 2018-01-03 07:00:54 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-03 07:00:54 -0800 |
commit | 5a6155f6a38a2d5515667406a5926c39753627e5 (patch) | |
tree | da3395a715b01841cd8ae9d52d85cbfb6d0049b8 /Firestore/core/test/firebase/firestore/util | |
parent | 727edcead2b7620dcd0c586352486370e15ffa45 (diff) |
Build and test both C++ loggers where possible (#595)
* Rename FIREBASE_BINARY_DIR to FIREBASE_INSTALL_DIR
Make this consistent with the outer superbuild and also make the
association with CMAKE_INSTALL_PREFIX more obvious.
* Build and test log_stdio separate from the rest of util
This is in preparation for adding a test for log_apple
* Build and test log_apple under CMake
Also add notes about how FIRLogger's debug mode can break this test
* Refactor log_apple to cut down duplicate switch statements
There's also a slight reduction in final binary size.
Diffstat (limited to 'Firestore/core/test/firebase/firestore/util')
-rw-r--r-- | Firestore/core/test/firebase/firestore/util/CMakeLists.txt | 21 | ||||
-rw-r--r-- | Firestore/core/test/firebase/firestore/util/log_test.cc | 10 |
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); |