From 1df9b016806439e834c3769c39ea2594b26bace0 Mon Sep 17 00:00:00 2001 From: Levi Tamasi Date: Wed, 18 Mar 2020 09:21:00 -0700 Subject: [PATCH] Disable distributed mutex test for valgrind_test (#6553) Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/6553 Test Plan: ``` $ make valgrind_test -j24 $ ./folly_synchronization_distributed_mutex_test DistributedMutex is not supported in ROCKSDB_LITE, on ARM, or in valgrind_test runs ``` Reviewed By: pdillinger Differential Revision: D20501966 Pulled By: ltamasi fbshipit-source-id: 386ec5f258f89d0781a36c5b390c665787093a74 --- .../folly/synchronization/test/DistributedMutexTest.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/third-party/folly/folly/synchronization/test/DistributedMutexTest.cpp b/third-party/folly/folly/synchronization/test/DistributedMutexTest.cpp index 5a9f58e3f..3ff1a8d35 100644 --- a/third-party/folly/folly/synchronization/test/DistributedMutexTest.cpp +++ b/third-party/folly/folly/synchronization/test/DistributedMutexTest.cpp @@ -13,7 +13,8 @@ #include #endif -#if !defined(ROCKSDB_LITE) && !defined(__ARM_ARCH) +#if !defined(ROCKSDB_LITE) && !defined(__ARM_ARCH) && \ + !defined(ROCKSDB_VALGRIND_RUN) #include #include @@ -1136,7 +1137,9 @@ int main(int argc, char** argv) { #else int main(int /*argc*/, char** /*argv*/) { - printf("DistributedMutex is not supported in ROCKSDB_LITE or on ARM\n"); + printf( + "DistributedMutex is not supported in ROCKSDB_LITE, on ARM, or in " + "valgrind_test runs\n"); return 0; } -#endif // !ROCKSDB_LITE && !__ARM_ARCH +#endif // !ROCKSDB_LITE && !__ARM_ARCH && !ROCKSDB_VALGRIND_RUN