From ad528fe5ca08dafff47d79c85abbf3e1fbb21568 Mon Sep 17 00:00:00 2001 From: Peter Dillinger Date: Thu, 5 Dec 2019 15:45:44 -0800 Subject: [PATCH] Disable folly_synchronization_distributed_mutex_test on ARM for now (#6126) Summary: This test is crashing on ARM but is not yet production code. Let's not let it block ARM CI. See PR https://github.com/facebook/rocksdb/issues/5932 Pull Request resolved: https://github.com/facebook/rocksdb/pull/6126 Test Plan: ./folly_synchronization_distributed_mutex_test, on Linux/ARM, on Linux/x86_64, and with LITE=1 on Linux/x86_64 (also disabled) Differential Revision: D18836576 Pulled By: pdillinger fbshipit-source-id: d8a36eea2f048e8330411d994435d1c58a15d978 --- .../synchronization/test/DistributedMutexTest.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/third-party/folly/folly/synchronization/test/DistributedMutexTest.cpp b/third-party/folly/folly/synchronization/test/DistributedMutexTest.cpp index e75d0f35c..5b85a671b 100644 --- a/third-party/folly/folly/synchronization/test/DistributedMutexTest.cpp +++ b/third-party/folly/folly/synchronization/test/DistributedMutexTest.cpp @@ -13,7 +13,7 @@ #include #endif -#ifndef ROCKSDB_LITE +#if !defined(ROCKSDB_LITE) && !defined(__ARM_ARCH) #include #include @@ -1128,9 +1128,15 @@ TEST(DistributedMutex, StressBigValueReturnSixtyFourThreads) { } } // namespace folly -#endif // ROCKSDB_LITE int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); } + +#else +int main(int /*argc*/, char** /*argv*/) { + printf("DistributedMutex is not supported in ROCKSDB_LITE or on ARM\n"); + return 0; +} +#endif // !ROCKSDB_LITE && !__ARM_ARCH -- GitLab