From 0e76d40aa1e3a1711c291c08d8a73335756b821b Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 9 Oct 2019 14:46:20 -0400 Subject: [PATCH] test/rgw: run ceph_test_rgw_gc_log in rgw verify suite since it requires a running ceph cluster, it can't run in 'make check' as a unittest. add it to the rgw/verify suite instead Signed-off-by: Casey Bodley --- qa/suites/rgw/verify/tasks/cls.yaml | 1 + qa/workunits/rgw/test_rgw_gc_log.sh | 5 +++++ src/test/rgw/CMakeLists.txt | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100755 qa/workunits/rgw/test_rgw_gc_log.sh diff --git a/qa/suites/rgw/verify/tasks/cls.yaml b/qa/suites/rgw/verify/tasks/cls.yaml index 88a8f9d239f6f..a45f7bb8b7ca2 100644 --- a/qa/suites/rgw/verify/tasks/cls.yaml +++ b/qa/suites/rgw/verify/tasks/cls.yaml @@ -6,3 +6,4 @@ tasks: - cls/test_cls_log.sh - cls/test_cls_refcount.sh - cls/test_cls_rgw.sh + - rgw/test_rgw_gc_log.sh diff --git a/qa/workunits/rgw/test_rgw_gc_log.sh b/qa/workunits/rgw/test_rgw_gc_log.sh new file mode 100755 index 0000000000000..ab4015aeffc6c --- /dev/null +++ b/qa/workunits/rgw/test_rgw_gc_log.sh @@ -0,0 +1,5 @@ +#!/bin/sh -e + +ceph_test_rgw_gc_log + +exit 0 diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt index cb010b54355cb..5e0fad13cacc5 100644 --- a/src/test/rgw/CMakeLists.txt +++ b/src/test/rgw/CMakeLists.txt @@ -172,5 +172,5 @@ add_ceph_unittest(unittest_rgw_kms) target_link_libraries(unittest_rgw_kms ${rgw_libs}) add_executable(ceph_test_rgw_gc_log test_rgw_gc_log.cc $) -add_ceph_unittest(ceph_test_rgw_gc_log) -target_link_libraries(ceph_test_rgw_gc_log radostest-cxx ${rgw_libs}) +target_link_libraries(ceph_test_rgw_gc_log ${rgw_libs} radostest-cxx) +install(TARGETS ceph_test_rgw_gc_log DESTINATION ${CMAKE_INSTALL_BINDIR}) -- 2.39.5