From 5b46bb9c1f25a5003f77e5aa1e3298b99895f58a Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Wed, 17 Mar 2021 15:29:37 -0400 Subject: [PATCH] test: ignore failures to force-enable lockdep PR #40062 tweaked the behavior of lockdep to compile it out of the code entirely for release builds. This fixes several gtests where lockdep was force-enabled. Signed-off-by: Jason Dillaman (cherry picked from commit bdc1178bd8a722233743a1b6ad63f79dccb3f8f8) --- src/test/immutable_object_cache/test_main.cc | 3 +-- src/test/librbd/test_main.cc | 3 +-- src/test/rbd_mirror/test_main.cc | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/test/immutable_object_cache/test_main.cc b/src/test/immutable_object_cache/test_main.cc index 0c68e6477ac76..571627e0bfd33 100644 --- a/src/test/immutable_object_cache/test_main.cc +++ b/src/test/immutable_object_cache/test_main.cc @@ -23,8 +23,7 @@ int main(int argc, char **argv) int r = rados.conf_set("lockdep", "true"); if (r < 0) { - std::cerr << "failed to enable lockdep" << std::endl; - return -r; + std::cerr << "warning: failed to enable lockdep" << std::endl; } return RUN_ALL_TESTS(); } diff --git a/src/test/librbd/test_main.cc b/src/test/librbd/test_main.cc index 4b66203bd3027..2ff9f69dea977 100644 --- a/src/test/librbd/test_main.cc +++ b/src/test/librbd/test_main.cc @@ -60,8 +60,7 @@ int main(int argc, char **argv) int r = rados.conf_set("lockdep", "true"); if (r < 0) { - std::cerr << "failed to enable lockdep" << std::endl; - return -r; + std::cerr << "warning: failed to enable lockdep" << std::endl; } int seed = getpid(); diff --git a/src/test/rbd_mirror/test_main.cc b/src/test/rbd_mirror/test_main.cc index 9226b086469f6..e6c708c97db08 100644 --- a/src/test/rbd_mirror/test_main.cc +++ b/src/test/rbd_mirror/test_main.cc @@ -46,8 +46,7 @@ int main(int argc, char **argv) int r = rados.conf_set("lockdep", "true"); if (r < 0) { - std::cerr << "failed to enable lockdep" << std::endl; - return -r; + std::cerr << "warning: failed to enable lockdep" << std::endl; } return RUN_ALL_TESTS(); } -- 2.39.5