From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 11 Dec 2019 17:28:53 +0000 (-0500)
Subject: qa/rgw: add rgw_obj and throttle tests to rgw verify suite
X-Git-Tag: v15.1.0~246^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32188%2Fhead;p=ceph.git

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 a45f7bb8b7ca..446e9347a6c0 100644
--- 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
index 000000000000..01dd2b5eea5b
--- /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
index 000000000000..f637b8f08e0d
--- /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 4093e4b01d12..50840a6ef32d 100644
--- 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)