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 0c68e6477ac76e4622b056683ee16634040d97cd..571627e0bfd33825920969d17ae7f1e7e8990114 100644 (file)
--- 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 4b66203bd30278ae39b6f7d1ad5105eeeb625af9..2ff9f69dea97731bc760ef0e841a973c5297bc21 100644 (file)
--- 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 9226b086469f66bc3c504468a48f77b8496e414f..e6c708c97db080324bf09ea437d5d01360bf74e2 100644 (file)
--- 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();
 }