Commit e96129da authored by Adam Simpkins's avatar Adam Simpkins Committed by Facebook Github Bot

cmake: fix the test builds

Summary:
- Fix the locations of some tests that have been moved.
- Remove some tests that have been deleted.
- Comment out some tests that depend on parts of folly that are not currently
  built by the CMake build scripts.
- Fix a build error in CompressionTest.cpp if FOLLY_HAVE_LIBZ is not defined.

Reviewed By: yfeldblum

Differential Revision: D6735700

fbshipit-source-id: 89f60751fa7079b2c609d23d85fbed2a0f317b55
parent 6c511999
main v2022.02.14.00 v2022.02.07.00 v2022.01.31.00 v2022.01.24.00 v2022.01.17.00 v2022.01.10.00 v2022.01.03.00 v2021.12.27.00 v2021.12.20.00 v2021.12.13.00 v2021.12.06.00 v2021.11.29.00 v2021.11.15.00 v2021.11.08.00 v2021.11.01.00 v2021.10.25.00 v2021.10.18.00 v2021.10.11.00 v2021.10.04.00 v2021.09.27.00 v2021.09.20.00 v2021.09.13.00 v2021.09.06.00 v2021.08.30.00 v2021.08.23.00 v2021.08.02.00 v2021.07.22.00 v2021.07.20.01 v2021.07.20.00 v2021.06.28.00 v2021.06.14.00 v2021.06.07.00 v2021.05.31.00 v2021.05.24.00 v2021.05.17.00 v2021.05.10.00 v2021.05.03.00 v2021.04.26.00 v2021.04.19.00 v2021.04.12.00 v2021.04.05.00 v2021.03.29.00 v2021.03.22.00 v2021.03.15.00 v2021.03.08.00 v2021.03.01.00 v2021.02.22.00 v2021.02.15.00 v2021.02.08.00 v2021.02.01.00 v2021.01.25.00 v2021.01.18.01 v2021.01.18.00 v2021.01.11.00 v2021.01.04.00 v2020.12.28.00 v2020.12.21.00 v2020.12.14.00 v2020.12.07.00 v2020.11.30.00 v2020.11.23.00 v2020.11.16.00 v2020.11.09.00 v2020.11.02.00 v2020.10.26.00 v2020.10.19.00 v2020.10.12.00 v2020.10.05.00 v2020.09.28.00 v2020.09.21.00 v2020.09.14.00 v2020.09.07.00 v2020.08.31.00 v2020.08.24.00 v2020.08.17.00 v2020.08.10.00 v2020.08.03.00 v2020.07.27.00 v2020.07.20.00 v2020.07.13.00 v2020.07.06.00 v2020.06.29.00 v2020.06.15.00 v2020.06.08.00 v2020.06.01.00 v2020.05.25.00 v2020.05.18.00 v2020.05.11.00 v2020.05.04.00 v2020.04.27.00 v2020.04.20.00 v2020.04.13.00 v2020.04.06.00 v2020.03.30.00 v2020.03.23.00 v2020.03.16.00 v2020.03.09.00 v2020.03.02.00 v2020.02.24.00 v2020.02.17.00 v2020.02.10.00 v2020.02.03.00 v2020.01.27.00 v2020.01.20.00 v2020.01.13.00 v2020.01.06.00 v2019.12.30.00 v2019.12.23.00 v2019.12.16.00 v2019.12.09.00 v2019.12.06.00 v2019.12.02.00 v2019.11.11.00 v2019.11.04.00 v2019.10.28.00 v2019.10.21.00 v2019.10.14.00 v2019.10.07.00 v2019.09.30.00 v2019.09.23.00 v2019.09.16.00 v2019.09.09.00 v2019.09.02.00 v2019.08.26.00 v2019.08.19.00 v2019.08.12.00 v2019.08.05.00 v2019.07.29.00 v2019.07.22.00 v2019.06.17.00 v2019.06.10.00 v2019.06.03.00 v2019.05.27.00 v2019.05.20.00 v2019.05.13.00 v2019.05.06.00 v2019.04.29.00 v2019.04.22.00 v2019.04.15.00 v2019.04.08.00 v2019.04.01.00 v2019.03.25.00 v2019.03.18.00 v2019.03.04.00 v2019.02.25.00 v2019.02.18.00 v2019.02.11.00 v2019.02.04.00 v2019.01.28.00 v2019.01.21.00 v2019.01.14.00 v2019.01.07.00 v2018.12.31.00 v2018.12.24.00 v2018.12.17.00 v2018.12.10.00 v2018.12.03.00 v2018.11.26.00 v2018.11.19.00 v2018.11.12.00 v2018.11.05.00 v2018.10.29.00 v2018.10.22.00 v2018.10.15.00 v2018.10.08.00 v2018.10.01.00 v2018.09.24.00 v2018.09.17.00 v2018.09.10.01 v2018.09.10.00 v2018.09.03.01 v2018.09.03.00 v2018.08.27.00 v2018.08.20.00 v2018.08.13.00 v2018.08.09.00 v2018.08.06.00 v2018.07.30.00 v2018.07.23.00 v2018.07.16.00 v2018.07.09.00 v2018.07.02.00 v2018.06.25.00 v2018.06.18.00 v2018.06.11.00 v2018.06.04.00 v2018.05.28.00 v2018.05.21.00 v2018.05.14.00 v2018.05.07.00 v2018.04.30.00 v2018.04.23.00 v2018.04.16.00 v2018.04.09.00 v2018.04.02.00 v2018.03.26.00 v2018.03.19.00 v2018.03.12.00 v2018.03.05.00 v2018.02.26.00 v2018.02.19.00 v2018.02.12.00 v2018.02.05.00 v2018.01.29.00 v2018.01.22.00
No related merge requests found
...@@ -559,6 +559,7 @@ if (BUILD_TESTS) ...@@ -559,6 +559,7 @@ if (BUILD_TESTS)
DIRECTORY lang/test/ DIRECTORY lang/test/
TEST bits_test SOURCES BitsTest.cpp TEST bits_test SOURCES BitsTest.cpp
TEST cold_class_test SOURCES ColdClassTest.cpp TEST cold_class_test SOURCES ColdClassTest.cpp
TEST safe_assert_test SOURCES SafeAssertTest.cpp
DIRECTORY memory/test/ DIRECTORY memory/test/
TEST arena_test SOURCES ArenaTest.cpp TEST arena_test SOURCES ArenaTest.cpp
...@@ -577,7 +578,7 @@ if (BUILD_TESTS) ...@@ -577,7 +578,7 @@ if (BUILD_TESTS)
DIRECTORY stats/test/ DIRECTORY stats/test/
TEST histogram_test SOURCES HistogramTest.cpp TEST histogram_test SOURCES HistogramTest.cpp
TEST timeseries_histogram_test SOURCES TimeseriesHistogramTest.cpp TEST timeseries_histogram_test SOURCES TimeseriesHistogramTest.cpp
TEST timeseries_test SOURCES TimeseriesTest.cpp TEST timeseries_test SOURCES TimeSeriesTest.cpp
DIRECTORY synchronization/test/ DIRECTORY synchronization/test/
TEST baton_test SOURCES BatonTest.cpp TEST baton_test SOURCES BatonTest.cpp
...@@ -592,6 +593,9 @@ if (BUILD_TESTS) ...@@ -592,6 +593,9 @@ if (BUILD_TESTS)
TEST thread_id_test SOURCES ThreadIdTest.cpp TEST thread_id_test SOURCES ThreadIdTest.cpp
TEST thread_name_test SOURCES ThreadNameTest.cpp TEST thread_name_test SOURCES ThreadNameTest.cpp
DIRECTORY synchronization/test/
TEST atomic_struct_test SOURCES AtomicStructTest.cpp
DIRECTORY test/ DIRECTORY test/
TEST ahm_int_stress_test SOURCES AHMIntStressTest.cpp TEST ahm_int_stress_test SOURCES AHMIntStressTest.cpp
TEST arena_smartptr_test SOURCES ArenaSmartPtrTest.cpp TEST arena_smartptr_test SOURCES ArenaSmartPtrTest.cpp
...@@ -601,12 +605,10 @@ if (BUILD_TESTS) ...@@ -601,12 +605,10 @@ if (BUILD_TESTS)
TEST atomic_hash_map_test HANGING TEST atomic_hash_map_test HANGING
SOURCES AtomicHashMapTest.cpp SOURCES AtomicHashMapTest.cpp
TEST atomic_linked_list_test SOURCES AtomicLinkedListTest.cpp TEST atomic_linked_list_test SOURCES AtomicLinkedListTest.cpp
TEST atomic_struct_test SOURCES AtomicStructTest.cpp
TEST atomic_unordered_map_test SOURCES AtomicUnorderedMapTest.cpp TEST atomic_unordered_map_test SOURCES AtomicUnorderedMapTest.cpp
TEST cacheline_padded_test SOURCES CachelinePaddedTest.cpp TEST cacheline_padded_test SOURCES CachelinePaddedTest.cpp
TEST clock_gettime_wrappers_test SOURCES ClockGettimeWrappersTest.cpp TEST clock_gettime_wrappers_test SOURCES ClockGettimeWrappersTest.cpp
TEST concurrent_skip_list_test SOURCES ConcurrentSkipListTest.cpp TEST concurrent_skip_list_test SOURCES ConcurrentSkipListTest.cpp
TEST container_traits_test SOURCES ContainerTraitsTest.cpp
TEST conv_test SOURCES ConvTest.cpp TEST conv_test SOURCES ConvTest.cpp
TEST cpu_id_test SOURCES CpuIdTest.cpp TEST cpu_id_test SOURCES CpuIdTest.cpp
TEST demangle_test SOURCES DemangleTest.cpp TEST demangle_test SOURCES DemangleTest.cpp
...@@ -624,7 +626,7 @@ if (BUILD_TESTS) ...@@ -624,7 +626,7 @@ if (BUILD_TESTS)
#TEST file_lock_test SOURCES FileLockTest.cpp #TEST file_lock_test SOURCES FileLockTest.cpp
TEST file_util_test HANGING TEST file_util_test HANGING
SOURCES FileUtilTest.cpp SOURCES FileUtilTest.cpp
TEST fingerprint_test SOURCES FingerprintTest.cpp # TEST fingerprint_test SOURCES FingerprintTest.cpp
TEST format_other_test SOURCES FormatOtherTest.cpp TEST format_other_test SOURCES FormatOtherTest.cpp
TEST format_test SOURCES FormatTest.cpp TEST format_test SOURCES FormatTest.cpp
TEST function_scheduler_test SOURCES FunctionSchedulerTest.cpp TEST function_scheduler_test SOURCES FunctionSchedulerTest.cpp
...@@ -672,14 +674,13 @@ if (BUILD_TESTS) ...@@ -672,14 +674,13 @@ if (BUILD_TESTS)
SOURCES ProducerConsumerQueueTest.cpp SOURCES ProducerConsumerQueueTest.cpp
TEST random_test SOURCES RandomTest.cpp TEST random_test SOURCES RandomTest.cpp
TEST range_test SOURCES RangeTest.cpp TEST range_test SOURCES RangeTest.cpp
TEST safe_assert_test SOURCES SafeAssertTest.cpp
TEST scope_guard_test SOURCES ScopeGuardTest.cpp TEST scope_guard_test SOURCES ScopeGuardTest.cpp
# Heavily dependent on drand and srand48 # Heavily dependent on drand and srand48
#TEST shared_mutex_test SOURCES SharedMutexTest.cpp #TEST shared_mutex_test SOURCES SharedMutexTest.cpp
TEST singleton_test SOURCES SingletonTest.cpp # SingletonTest requires Subprocess
#TEST singleton_test SOURCES SingletonTest.cpp
TEST singleton_test_global SOURCES SingletonTestGlobal.cpp TEST singleton_test_global SOURCES SingletonTestGlobal.cpp
TEST singleton_thread_local_test SOURCES SingletonThreadLocalTest.cpp TEST singleton_thread_local_test SOURCES SingletonThreadLocalTest.cpp
TEST singletonvault_c_test SOURCES SingletonVaultCTest.cpp
TEST small_vector_test SOURCES small_vector_test.cpp TEST small_vector_test SOURCES small_vector_test.cpp
TEST sorted_vector_types_test SOURCES sorted_vector_test.cpp TEST sorted_vector_types_test SOURCES sorted_vector_test.cpp
TEST string_test SOURCES StringTest.cpp TEST string_test SOURCES StringTest.cpp
......
...@@ -40,9 +40,9 @@ ...@@ -40,9 +40,9 @@
#if FOLLY_HAVE_LIBZ #if FOLLY_HAVE_LIBZ
#include <folly/compression/Zlib.h> #include <folly/compression/Zlib.h>
#endif
namespace zlib = folly::io::zlib; namespace zlib = folly::io::zlib;
#endif
namespace folly { namespace folly {
namespace io { namespace io {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment