Fix tests in CMake build

[folly.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bfa99744ae06ff38f6acd66bbf1a9d6a5e27480..8daaf52cfceee7b9cdd4e4668de36f9031cc7001 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -292,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
@@ -345,6 +347,7 @@ if (BUILD_TESTS)
 
     DIRECTORY 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
@@ -441,6 +444,7 @@ 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
@@ -467,7 +471,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