From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 17 Mar 2021 19:29:37 +0000 (-0400)
Subject: test: ignore failures to force-enable lockdep
X-Git-Tag: v16.2.0~92^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F40165%2Fhead;p=ceph.git

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 <dillaman@redhat.com>
(cherry picked from commit bdc1178bd8a722233743a1b6ad63f79dccb3f8f8)
---

diff --git a/src/test/immutable_object_cache/test_main.cc b/src/test/immutable_object_cache/test_main.cc
index 0c68e6477ac7..571627e0bfd3 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 4b66203bd302..2ff9f69dea97 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 9226b086469f..e6c708c97db0 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();
 }