packaging: Add ceph-test debian package

The ceph-test package includes optional test and benchmarking programs.

Conflicts:

	debian/control
	debian/rules

4 files changed, 67 insertions, 3 deletions

diff --git a/debian/ceph-test.install b/debian/ceph-test.install
new file mode 100644
index 00000000000..b629bd6d97c
--- /dev/null
+++ b/debian/ceph-test.install
@@ -0,0 +1,43 @@
+usr/bin/dupstore
+usr/bin/multi_stress_watch
+usr/bin/psim
+usr/bin/radosacl
+usr/bin/rest-bench
+usr/bin/rgw_multiparser
+usr/bin/scratchtool
+usr/bin/scratchtoolpp
+usr/bin/streamtest
+usr/bin/test_cls_rbd
+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_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_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/xattr_bench
diff --git a/debian/control b/debian/control
index b03fe89ed01..796227b05d2 100644
--- a/debian/control
+++ b/debian/control
@@ -316,6 +316,18 @@ Description: synchronize data between cloud object storage providers or a local
  storage providers, such as Amazon S3 (or compatible services), a
  Ceph RADOS cluster, or a local directory.
 
+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 6090f1b658f..da7988a1f6f 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
 
 ifeq ($(DEB_HOST_ARCH), armel)
   # armel supports ARMv4t or above instructions sets.
@@ -124,6 +125,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
diff --git a/src/Makefile.am b/src/Makefile.am
index 4d774b02a34..f3c38e43f25 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -214,9 +214,9 @@ testrados_SOURCES = test/osd/TestRados.cc test/osd/TestOpStat.cc test/osd/Object
 testrados_LDADD = librados.la $(LIBGLOBAL_LDA)
 bin_DEBUGPROGRAMS += testrados
 
-omapbench_SOURCES = test/omap_bench.cc
-omapbench_LDADD = librados.la $(LIBGLOBAL_LDA)
-bin_DEBUGPROGRAMS += omapbench
+#omapbench_SOURCES = test/omap_bench.cc
+#omapbench_LDADD = librados.la $(LIBGLOBAL_LDA)
+#bin_DEBUGPROGRAMS += omapbench
 
 multi_stress_watch_SOURCES = test/multi_stress_watch.cc test/rados-api/test.cc
 multi_stress_watch_LDADD = librados.la $(LIBGLOBAL_LDA)
@@ -1619,7 +1619,14 @@ noinst_HEADERS = \
 	test/osd/TestOpStat.h\
 	global/pidfile.h\
 	common/sync_filesystem.h \
+	test/ObjectMap/KeyValueDBMemory.h \
+	test/common/ObjectContents.h \
 	test/encoding/types.h \
+	test/filestore/workload_generator.h \
+	test/filestore/DeterministicOpSequence.h \
+	test/filestore/FileStoreTracker.h \
+	test/filestore/FileStoreDiff.h \
+	test/filestore/TestFileStoreState.h \
 	test/system/cross_process_sem.h \
 	test/system/st_rados_create_pool.h \
 	test/system/st_rados_list_objects.h \