Fixes for missing and replicated files in ceph.spec.in

Commit Message

huang jun Feb. 22, 2014, 4:25 a.m. UTC

we can also use test_* instead of listing all test_xx  files while
building debian package


2014-02-22 7:04 GMT+08:00 Ken Dreyer <[e-mail]>:
> On Fri, Feb 21, 2014 at 1:48 PM, Sage Weil <[e-mail]> wrote:
>> On Fri, 21 Feb 2014, Ken Dreyer wrote:
>>> On Fri, Feb 21, 2014 at 4:27 AM, huang jun <[e-mail]> wrote:
>>> > @@ -690,6 +689,7 @@ fi
>>> >  %{_bindir}/ceph_test_rados_list_parallel
>>> >  %{_bindir}/ceph_test_rados_open_pools_parallel
>>> >  %{_bindir}/ceph_test_rados_watch_notify
>>> > +%{_bindir}/ceph_test_rgw_manifest
>>> >  %{_bindir}/ceph_test_signal_handlers
>>> >  %{_bindir}/ceph_test_snap_mapper
>>>
>>>
>>> It seems like we have to deal with this sort of thing over and over.
>>> Anyone have objections to simply using a wildcard to capture all the
>>> test files? Something like %{_bindir}/ceph_test_* ?
>>
>> Sounds good to me.  This is only stuff that 'make install' is putting in
>> place right?
>
> Yep, that's right, the wildcard will just match what 'make install' has done.
>
> Pull request is at https://github.com/ceph/ceph/pull/1287 . Huang, if
> you have time, it would be great to get your review before we merge.
>
> - Ken

Comments

Ken Dreyer March 5, 2014, 3:32 a.m. UTC | #1

On Fri, Feb 21, 2014 at 9:25 PM, huang jun <[e-mail]> wrote:
> we can also use test_* instead of listing all test_xx  files while
> building debian package

This works in my basic testing. Pull request submitted here:
https://github.com/ceph/ceph/pull/1371

- Ken
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/debian/ceph-test.install b/debian/ceph-test.install
index bdcb75f..ac79055 100644
--- a/debian/ceph-test.install
+++ b/debian/ceph-test.install
@@ -19,63 +19,7 @@  usr/bin/ceph_smalliobenchdumb
 usr/bin/ceph_smalliobenchfs
 usr/bin/ceph_smalliobenchrbd
 usr/bin/ceph_streamtest
-usr/bin/ceph_test_cfuse_cache_invalidate
-usr/bin/ceph_test_cls_hello
-usr/bin/ceph_test_cls_lock
-usr/bin/ceph_test_cls_log
-usr/bin/ceph_test_cls_rbd
-usr/bin/ceph_test_cls_refcount
-usr/bin/ceph_test_cls_replica_log
-usr/bin/ceph_test_cls_rgw
-usr/bin/ceph_test_cls_rgw_log
-usr/bin/ceph_test_cls_rgw_meta
-usr/bin/ceph_test_cls_rgw_opstate
-usr/bin/ceph_test_cls_statelog
-usr/bin/ceph_test_cls_version
-usr/bin/ceph_test_cors
-usr/bin/ceph_test_crypto
-usr/bin/ceph_test_filejournal
-usr/bin/ceph_test_objectstore
-usr/bin/ceph_test_filestore_idempotent
-usr/bin/ceph_test_filestore_idempotent_sequence
-usr/bin/ceph_test_objectstore_workloadgen
-usr/bin/ceph_test_ioctls
-usr/bin/ceph_test_keys
-usr/bin/ceph_test_keyvaluedb_atomicity
-usr/bin/ceph_test_keyvaluedb_iterators
-usr/bin/ceph_test_libcephfs
-usr/bin/ceph_test_librbd
-usr/bin/ceph_test_librbd_fsx
-usr/bin/ceph_test_mon_workloadgen
-usr/bin/ceph_test_msgr
-usr/bin/ceph_test_mutate
-usr/bin/ceph_test_object_map
-usr/bin/ceph_test_objectcacher_stress
-usr/bin/ceph_test_rados
-usr/bin/ceph_test_rados_api_aio
-usr/bin/ceph_test_rados_api_cls
-usr/bin/ceph_test_rados_api_c_read_operations
-usr/bin/ceph_test_rados_api_c_write_operations
-usr/bin/ceph_test_rados_api_cmd
-usr/bin/ceph_test_rados_api_io
-usr/bin/ceph_test_rados_api_list
-usr/bin/ceph_test_rados_api_lock
-usr/bin/ceph_test_rados_api_misc
-usr/bin/ceph_test_rados_api_tier
-usr/bin/ceph_test_rados_api_pool
-usr/bin/ceph_test_rados_api_snapshots
-usr/bin/ceph_test_rados_api_stat
-usr/bin/ceph_test_rados_api_watch_notify
-usr/bin/ceph_test_rados_delete_pools_parallel
-usr/bin/ceph_test_rados_list_parallel
-usr/bin/ceph_test_rados_open_pools_parallel
-usr/bin/ceph_test_rados_watch_notify
-usr/bin/ceph_test_rewrite_latency
-usr/bin/ceph_test_signal_handlers
-usr/bin/ceph_test_snap_mapper
-usr/bin/ceph_test_stress_watch
-usr/bin/ceph_test_timers
-usr/bin/ceph_test_trans
+usr/bin/ceph_test_*
 usr/bin/ceph_tpbench
 usr/bin/ceph_xattr_bench
 usr/bin/ceph-monstore-tool