qa/rgw: add rgw_obj and throttle tests to rgw verify suite

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/qa/suites/rgw/verify/tasks/cls.yaml b/qa/suites/rgw/verify/tasks/cls.yaml
index a45f7bb8b7ca2c5f2db819daefe9447ffa43b22c..446e9347a6c0ad28bd33d6f88b6037cc70abcc5c 100644 (file)
--- a/qa/suites/rgw/verify/tasks/cls.yaml
+++ b/qa/suites/rgw/verify/tasks/cls.yaml
@@ -7,3 +7,5 @@ tasks:
         - cls/test_cls_refcount.sh
         - cls/test_cls_rgw.sh
         - rgw/test_rgw_gc_log.sh
+        - rgw/test_rgw_obj.sh
+        - rgw/test_rgw_throttle.sh

diff --git a/qa/workunits/rgw/test_rgw_obj.sh b/qa/workunits/rgw/test_rgw_obj.sh
new file mode 100755 (executable)
index 0000000..01dd2b5
--- /dev/null
+++ b/qa/workunits/rgw/test_rgw_obj.sh
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+ceph_test_rgw_obj
+
+exit 0

diff --git a/qa/workunits/rgw/test_rgw_throttle.sh b/qa/workunits/rgw/test_rgw_throttle.sh
new file mode 100755 (executable)
index 0000000..f637b8f
--- /dev/null
+++ b/qa/workunits/rgw/test_rgw_throttle.sh
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+ceph_test_rgw_throttle
+
+exit 0

diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt
index 4093e4b01d129e263245dc001c7fc398a439c1aa..50840a6ef32d13c0e332e6674cce98f7f353ac24 100644 (file)
--- a/src/test/rgw/CMakeLists.txt
+++ b/src/test/rgw/CMakeLists.txt
@@ -89,6 +89,7 @@ target_link_libraries(ceph_test_rgw_obj
   ${UNITTEST_LIBS}
   ${CRYPTO_LIBS}
   )
+install(TARGETS ceph_test_rgw_obj DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 set(test_rgw_crypto_srcs test_rgw_crypto.cc)
 add_executable(unittest_rgw_crypto
@@ -130,6 +131,7 @@ add_executable(ceph_test_rgw_throttle
   $<TARGET_OBJECTS:unit-main>)
 target_link_libraries(ceph_test_rgw_throttle ${rgw_libs}
   librados global ${UNITTEST_LIBS})
+install(TARGETS ceph_test_rgw_throttle DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 add_executable(unittest_rgw_iam_policy test_rgw_iam_policy.cc)
 add_ceph_unittest(unittest_rgw_iam_policy)