Merge pull request #10083 from trociny/wip-16539

rbd-mirror: remove ceph_test_rbd_mirror_image_replay test case Reviewed-by: Jason Dillaman <dillaman@redhat.com>
ceph · Jul 1, 2016 · 0c500f8 · 0c500f8
2 parents dbe4a72 + 06a333b
commit 0c500f8
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 520 deletions.
diff --git a/qa/workunits/rbd/rbd_mirror_image_replay.sh b/qa/workunits/rbd/rbd_mirror_image_replay.sh
diff --git a/src/test/Makefile-client.am b/src/test/Makefile-client.am
@@ -539,22 +539,6 @@ ceph_test_rbd_mirror_random_write_LDADD = \
 	$(LIBRBD) $(LIBRADOS) $(CEPH_GLOBAL)
 bin_DEBUGPROGRAMS += ceph_test_rbd_mirror_random_write
 
-ceph_test_rbd_mirror_image_replay_SOURCES = \
-	test/rbd_mirror/image_replay.cc
-ceph_test_rbd_mirror_image_replay_LDADD = \
-	librbd_mirror_internal.la \
-	librbd_internal.la \
-	librbd_api.la \
-	$(LIBRBD_TYPES) \
-	libjournal.la \
-	$(LIBRADOS) $(LIBOSDC) \
-	librados_internal.la \
-	libcls_rbd_client.la \
-	libcls_lock_client.la \
-	libcls_journal_client.la \
-	$(CEPH_GLOBAL)
-bin_DEBUGPROGRAMS += ceph_test_rbd_mirror_image_replay
-
 if LINUX
 ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.cc
 ceph_test_librbd_fsx_LDADD = \

diff --git a/src/test/rbd_mirror/CMakeLists.txt b/src/test/rbd_mirror/CMakeLists.txt
@@ -85,31 +85,6 @@ target_link_libraries(ceph_test_rbd_mirror_random_write
   librbd librados global keyutils
   )
 
-add_executable(ceph_test_rbd_mirror_image_replay
-  image_replay.cc
-  ${CMAKE_SOURCE_DIR}/src/common/ContextCompletion.cc
-  $<TARGET_OBJECTS:parse_secret_objs>)
-set_target_properties(ceph_test_rbd_mirror_image_replay PROPERTIES
-  COMPILE_FLAGS ${UNITTEST_CXX_FLAGS})
-target_link_libraries(ceph_test_rbd_mirror_image_replay
-  rbd_mirror
-  rados_test_stub
-  rbd_mirror_internal
-  rbd_internal
-  rbd_api
-  journal
-  cls_rbd_client
-  cls_lock_client
-  cls_journal_client
-  rbd_types
-  librados
-  librbd
-  osdc
-  global
-  keyutils
-  radostest
-  ${UNITTEST_LIBS})
-
 install(TARGETS
   ceph_test_rbd_mirror
   ceph_test_rbd_mirror_random_write