test/librbd: enable the functional tests on Windows

Right now, the librbd tests are skipped on Windows.

This change enables the functional tests, which can run with
just a few modifications.

We'll continue skipping the unit tests however, which require
too much OSD code that hasn't been ported (e.g. cls, libosd, etc).

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 841b7ffa6cac9baf003e052a4422bc2c90250b15..09281ab2dbf5436a65d86738bb99797d74284473 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -22,11 +22,9 @@ add_subdirectory(librados_test_stub)
 if(WITH_LIBRADOSSTRIPER)
   add_subdirectory(libradosstriper)
 endif()
-if(WITH_RBD AND NOT WIN32)
-  # librbd tests require libcls*, which in turn require libos and libosd, which
-  # haven't been ported to Windows yet.
+if(WITH_RBD)
   add_subdirectory(librbd)
-endif(WITH_RBD AND NOT WIN32)
+endif()
 if (WITH_CEPHFS)
   add_subdirectory(mds)
 endif()

diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
index 87984bd94a96a7b38ee2cc6c3c44f541e884ccf3..0ae29b8bf18571d16995bd4c17d01d8efd89d8b3 100644 (file)
--- a/src/test/librbd/CMakeLists.txt
+++ b/src/test/librbd/CMakeLists.txt
@@ -152,6 +152,11 @@ if(LINUX AND HAVE_LIBCRYPTSETUP)
           crypto/luks/test_mock_LoadRequest.cc)
 endif()
 
+# On Windows, we'll skip librbd unit tests for the time being, running just the
+# functional tests. The reason is that the unit tests require libcls*, which in
+# turn requires libos and libosd, however those libraries haven't been ported to
+# Windows.
+if(NOT WIN32)
 add_executable(unittest_librbd
   ${unittest_librbd_srcs}
   $<TARGET_OBJECTS:common_texttable_obj>)
@@ -187,6 +192,7 @@ if(WITH_RBD_RWL OR WITH_RBD_SSD_CACHE)
   target_link_libraries(unittest_librbd
     librbd_plugin_pwl_cache)
 endif()
+endif(NOT WIN32)
 
 add_executable(ceph_test_librbd
   test_main.cc