Merge remote-tracking branch 'gh/wip-ceph-test' into next

3 files changed, 71 insertions, 0 deletions

diff --git a/debian/ceph-test.install b/debian/ceph-test.install
new file mode 100644
index 00000000000..46c4ec882ed
--- /dev/null
+++ b/debian/ceph-test.install
@@ -0,0 +1,57 @@
+usr/bin/bench_log
+usr/bin/dupstore
+usr/bin/kvstorebench
+usr/bin/multi_stress_watch
+usr/bin/omapbench
+usr/bin/psim
+usr/bin/radosacl
+usr/bin/rest-bench
+usr/bin/rgw_multiparser
+usr/bin/scratchtool
+usr/bin/scratchtoolpp
+usr/bin/smalliobench
+usr/bin/smalliobenchdumb
+usr/bin/smalliobenchfs
+usr/bin/streamtest
+usr/bin/test_cfuse_cache_invalidate
+usr/bin/test_cls_lock
+usr/bin/test_cls_rbd
+usr/bin/test_cls_refcount
+usr/bin/test_cls_rgw
+usr/bin/test_filejournal
+usr/bin/test_filestore
+usr/bin/test_filestore_idempotent
+usr/bin/test_filestore_idempotent_sequence
+usr/bin/test_filestore_workloadgen
+usr/bin/test_ioctls
+usr/bin/test_keyvaluedb_atomicity
+usr/bin/test_keyvaluedb_iterators
+usr/bin/test_libcephfs
+usr/bin/test_librbd
+usr/bin/test_librbd_fsx
+usr/bin/test_mutate
+usr/bin/test_object_map
+usr/bin/test_rados_api_aio
+usr/bin/test_rados_api_cls
+usr/bin/test_rados_api_io
+usr/bin/test_rados_api_list
+usr/bin/test_rados_api_misc
+usr/bin/test_rados_api_pool
+usr/bin/test_rados_api_snapshots
+usr/bin/test_rados_api_stat
+usr/bin/test_rados_api_watch_notify
+usr/bin/test_rewrite_latency
+usr/bin/test_stress_watch
+usr/bin/test_trans
+usr/bin/testcrypto
+usr/bin/testkeys
+usr/bin/testmsgr
+usr/bin/testrados
+usr/bin/testrados_delete_pools_parallel
+usr/bin/testrados_list_parallel
+usr/bin/testrados_open_pools_parallel
+usr/bin/testrados_watch_notify
+usr/bin/testsignal_handlers
+usr/bin/testtimers
+usr/bin/tpbench
+usr/bin/xattr_bench
diff --git a/debian/control b/debian/control
index 45030953a98..2f0c311225f 100644
--- a/debian/control
+++ b/debian/control
@@ -308,6 +308,18 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ceph-common, xml2, curl
 Description: RESTful bencher that can be used to benchmark
  radosgw performance.
 
+Package: ceph-test
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ceph-common, xml2, curl
+Description:   Ceph test and benchmarking tools.
+
+Package: ceph-test-dbg
+Architecture: linux-any
+Section: debug
+Priority: extra
+Depends: ${shlibs:Depends}, ${misc:Depends}, ceph-common, xml2, curl
+Description:  Ceph test and benchmarking tools.
+
 Package: python-ceph
 Architecture: linux-any
 Section: python
diff --git a/debian/rules b/debian/rules
index 6d6138559e9..32380a41850 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,7 @@ endif
 export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 extraopts += --with-ocf --with-rest-bench --with-nss
+extraopts += --with-debug
 extraopts += --enable-cephfs-java
 
 ifeq ($(DEB_HOST_ARCH), armel)
@@ -126,6 +127,7 @@ binary-arch: build install
 	dh_strip -plibcephfs1 --dbg-package=libcephfs1-dbg
 	dh_strip -pradosgw --dbg-package=radosgw-dbg
 	dh_strip -prest-bench --dbg-package=rest-bench-dbg
+	dh_strip -pceph-test --dbg-package=ceph-test-dbg
 
 	dh_compress
 	dh_fixperms