logging: make XLOG_GET_CATEGORY() safe for all callers

[folly.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 479ff5ece5e9862b41e7da011e04da8b46fddffa..61fa69ee1631812733363823010d6fec30d5df03 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,6 +79,7 @@ REMOVE_MATCHES_FROM_LISTS(files hfiles
   MATCHES
     "/build/"
     "/experimental/exception_tracer/"
+    "/experimental/hazptr/bench/"
     "/experimental/hazptr/example/"
     "/experimental/symbolizer/"
     "/futures/exercises/"
@@ -312,6 +313,29 @@ if (BUILD_TESTS)
       #TEST async_io_test SOURCES AsyncIOTest.cpp
       TEST fs_util_test SOURCES FsUtilTest.cpp
 
+    DIRECTORY experimental/logging/test/
+      TEST logging-test
+        HEADERS
+          TestLogHandler.h
+          XlogHeader1.h
+          XlogHeader2.h
+        SOURCES
+          AsyncFileWriterTest.cpp
+          GlogFormatterTest.cpp
+          ImmediateFileWriterTest.cpp
+          LogCategoryTest.cpp
+          LoggerDBTest.cpp
+          LoggerTest.cpp
+          LogLevelTest.cpp
+          LogMessageTest.cpp
+          LogNameTest.cpp
+          LogStreamTest.cpp
+          RateLimiterTest.cpp
+          StandardLogHandlerTest.cpp
+          XlogFile1.cpp
+          XlogFile2.cpp
+          XlogTest.cpp
+
     DIRECTORY fibers/test/
       TEST fibers_test SOURCES FibersTest.cpp
 
@@ -414,6 +438,11 @@ if (BUILD_TESTS)
     DIRECTORY ssl/test/
       TEST openssl_hash_test SOURCES OpenSSLHashTest.cpp
 
+    DIRECTORY stats/test/
+      TEST histogram_test SOURCES HistogramTest.cpp
+      TEST timeseries_histogram_test SOURCES TimeseriesHistogramTest.cpp
+      TEST timeseries_test SOURCES TimeseriesTest.cpp
+
     DIRECTORY test/
       TEST ahm_int_stress_test SOURCES AHMIntStressTest.cpp
       TEST apply_tuple_test SOURCES ApplyTupleTest.cpp
@@ -469,7 +498,6 @@ if (BUILD_TESTS)
       TEST group_varint_test_ssse3 SOURCES GroupVarintTest.cpp
       TEST has_member_fn_traits_test SOURCES HasMemberFnTraitsTest.cpp
       TEST hash_test SOURCES HashTest.cpp
-      TEST histogram_test SOURCES HistogramTest.cpp
       TEST indestructible_test SOURCES IndestructibleTest.cpp
       TEST indexed_mem_pool_test SOURCES IndexedMemPoolTest.cpp
       # MSVC Preprocessor stringizing raw string literals bug
@@ -534,8 +562,6 @@ if (BUILD_TESTS)
       TEST thread_local_test SOURCES ThreadLocalTest.cpp
       TEST thread_name_test SOURCES ThreadNameTest.cpp
       TEST timeout_queue_test SOURCES TimeoutQueueTest.cpp
-      TEST timeseries_histogram_test SOURCES TimeseriesHistogramTest.cpp
-      TEST timeseries_test SOURCES TimeseriesTest.cpp
       TEST token_bucket_test SOURCES TokenBucketTest.cpp
       TEST traits_test SOURCES TraitsTest.cpp
       TEST try_test SOURCES TryTest.cpp