X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=blobdiff_plain;f=CMakeLists.txt;h=940e79a7fadf10770d4e1cc1b580727c59fba907;hp=a8895f73a12d74a3733fe07521eea7cd52fd750a;hb=3179d4464f4d211d18bb784a7d6c97390035e266;hpb=86c0ed4ea3f3e83236fc44540d3d62f801d7c949

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8895f73..940e79a7 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,6 +81,7 @@ REMOVE_MATCHES_FROM_LISTS(files hfiles
     "/experimental/exception_tracer/"
     "/experimental/hazptr/bench/"
     "/experimental/hazptr/example/"
+    "/experimental/logging/example/"
     "/experimental/symbolizer/"
     "/futures/exercises/"
     "/test/"
@@ -253,6 +254,9 @@ if (BUILD_TESTS)
     ${FOLLY_DIR}/test/SingletonTestStructs.cpp
     ${FOLLY_DIR}/test/SocketAddressTestHelper.cpp
     ${FOLLY_DIR}/test/SocketAddressTestHelper.h
+    ${FOLLY_DIR}/experimental/logging/test/TestLogHandler.h
+    ${FOLLY_DIR}/futures/test/TestExecutor.cpp
+    ${FOLLY_DIR}/futures/test/TestExecutor.h
     ${FOLLY_DIR}/io/async/test/BlockingSocket.h
     ${FOLLY_DIR}/io/async/test/MockAsyncServerSocket.h
     ${FOLLY_DIR}/io/async/test/MockAsyncSocket.h
@@ -288,6 +292,8 @@ if (BUILD_TESTS)
   apply_folly_compile_options_to_target(folly_test_support)
 
   folly_define_tests(
+    DIRECTORY concurrency/test/
+      TEST cache_locality_test SOURCES CacheLocalityTest.cpp
     DIRECTORY experimental/test/
       TEST autotimer_test SOURCES AutoTimerTest.cpp
       TEST bits_test_2 SOURCES BitsTest.cpp
@@ -313,46 +319,72 @@ if (BUILD_TESTS)
       #TEST async_io_test SOURCES AsyncIOTest.cpp
       TEST fs_util_test SOURCES FsUtilTest.cpp
 
+    DIRECTORY experimental/logging/test/
+      TEST async_file_writer_test SOURCES AsyncFileWriterTest.cpp
+      TEST glog_formatter_test SOURCES GlogFormatterTest.cpp
+      TEST immediate_file_writer_test SOURCES ImmediateFileWriterTest.cpp
+      TEST log_category_test SOURCES LogCategoryTest.cpp
+      TEST logger_db_test SOURCES LoggerDBTest.cpp
+      TEST logger_test SOURCES LoggerTest.cpp
+      TEST log_level_test SOURCES LogLevelTest.cpp
+      TEST log_message_test SOURCES LogMessageTest.cpp
+      TEST log_name_test SOURCES LogNameTest.cpp
+      TEST log_stream_test SOURCES LogStreamTest.cpp
+      TEST printf_test SOURCES PrintfTest.cpp
+      TEST rate_limiter_test SOURCES RateLimiterTest.cpp
+      TEST standard_log_handler_test SOURCES StandardLogHandlerTest.cpp
+      TEST xlog_test
+        HEADERS
+          XlogHeader1.h
+          XlogHeader2.h
+        SOURCES
+          XlogFile1.cpp
+          XlogFile2.cpp
+          XlogTest.cpp
+
     DIRECTORY fibers/test/
       TEST fibers_test SOURCES FibersTest.cpp
 
     DIRECTORY futures/test/
-      TEST futures-test
+      TEST barrier_test SOURCES BarrierTest.cpp
+      TEST callback_lifetime_test SOURCES CallbackLifetimeTest.cpp
+      TEST collect_test SOURCES CollectTest.cpp
+      TEST context_test SOURCES ContextTest.cpp
+      TEST core_test SOURCES CoreTest.cpp
+      TEST ensure_test SOURCES EnsureTest.cpp
+      TEST executor_test SOURCES ExecutorTest.cpp
+      TEST fsm_test SOURCES FSMTest.cpp
+      TEST filter_test SOURCES FilterTest.cpp
+      TEST future_splitter_test SOURCES FutureSplitterTest.cpp
+      # MSVC SFINAE bug
+      #TEST future_test SOURCES FutureTest.cpp
+      TEST header_compile_test SOURCES HeaderCompileTest.cpp
+      TEST interrupt_test SOURCES InterruptTest.cpp
+      TEST map_test SOURCES MapTest.cpp
+      TEST non_copyable_lambda_test SOURCES NonCopyableLambdaTest.cpp
+      TEST poll_test SOURCES PollTest.cpp
+      TEST promise_test SOURCES PromiseTest.cpp
+      TEST reduce_test SOURCES ReduceTest.cpp
+      # MSVC SFINAE bug
+      #TEST retrying_test SOURCES RetryingTest.cpp
+      TEST self_destruct_test SOURCES SelfDestructTest.cpp
+      TEST shared_promise_test SOURCES SharedPromiseTest.cpp
+      TEST test_executor_test SOURCES TestExecutorTest.cpp
+      TEST then_compile_test
         HEADERS
           ThenCompileTest.h
         SOURCES
-          BarrierTest.cpp
-          CollectTest.cpp
-          ContextTest.cpp
-          CoreTest.cpp
-          EnsureTest.cpp
-          ExecutorTest.cpp
-          FSMTest.cpp
-          FilterTest.cpp
-          # MSVC SFINAE bug
-          #FutureTest.cpp
-          HeaderCompileTest.cpp
-          InterruptTest.cpp
-          MapTest.cpp
-          NonCopyableLambdaTest.cpp
-          PollTest.cpp
-          PromiseTest.cpp
-          ReduceTest.cpp
-          # MSVC SFINAE bug
-          #RetryingTest.cpp
-          SelfDestructTest.cpp
-          SharedPromiseTest.cpp
           ThenCompileTest.cpp
-          ThenTest.cpp
-          TimekeeperTest.cpp
-          TimesTest.cpp
-          UnwrapTest.cpp
-          ViaTest.cpp
-          WaitTest.cpp
-          WhenTest.cpp
-          WhileDoTest.cpp
-          WillEqualTest.cpp
-          WindowTest.cpp
+      TEST then_test SOURCES ThenTest.cpp
+      TEST timekeeper_test SOURCES TimekeeperTest.cpp
+      TEST times_test SOURCES TimesTest.cpp
+      TEST unwrap_test SOURCES UnwrapTest.cpp
+      TEST via_test SOURCES ViaTest.cpp
+      TEST wait_test SOURCES WaitTest.cpp
+      TEST when_test SOURCES WhenTest.cpp
+      TEST while_do_test SOURCES WhileDoTest.cpp
+      TEST will_equal_test SOURCES WillEqualTest.cpp
+      TEST window_test SOURCES WindowTest.cpp
 
     DIRECTORY gen/test/
       # MSVC bug can't resolve initializer_list constructor properly
@@ -388,6 +420,8 @@ if (BUILD_TESTS)
           # This is disabled because it depends on things that don't exist
           # on Windows.
           #EventHandlerTest.cpp
+          # The async signal handler is not supported on Windows.
+          #AsyncSignalHandlerTest.cpp
       TEST async_timeout_test SOURCES AsyncTimeoutTest.cpp
       TEST AsyncUDPSocketTest SOURCES AsyncUDPSocketTest.cpp
       TEST DelayedDestructionTest SOURCES DelayedDestructionTest.cpp
@@ -411,10 +445,16 @@ if (BUILD_TESTS)
       TEST constexpr_test SOURCES ConstexprTest.cpp
       TEST libgen-test SOURCES LibgenTest.cpp
       TEST time-test SOURCES TimeTest.cpp
+      TEST openssl_portability_test SOURCES OpenSSLPortabilityTest.cpp
 
     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
@@ -432,7 +472,6 @@ if (BUILD_TESTS)
       TEST baton_test SOURCES BatonTest.cpp
       TEST bit_iterator_test SOURCES BitIteratorTest.cpp
       TEST bits_test SOURCES BitsTest.cpp
-      TEST cache_locality_test SOURCES CacheLocalityTest.cpp
       TEST cacheline_padded_test SOURCES CachelinePaddedTest.cpp
       TEST call_once_test SOURCES CallOnceTest.cpp
       TEST checksum_test SOURCES ChecksumTest.cpp
@@ -470,7 +509,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
@@ -535,8 +573,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