From 840e918fd4113eb1cafea7a272e2686d63e6dbcb Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Wed, 12 Feb 2014 12:44:21 +0100 Subject: [PATCH] tests: fix packaging for s/filestore/objectstore/ The binaries file name have changed and need to be updated in the packaging files for deb and rpm. Fix a few leftovers as well. Fixing 1a588f18ba0e57df64f8a48c1393a4bc65019571 Signed-off-by: Loic Dachary --- ceph.spec.in | 4 ++-- debian/ceph-test.install | 4 ++-- src/test/objectstore/TestObjectStoreState.cc | 2 +- src/test/objectstore/store_test.cc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index a16882a9881..fc517dbc080 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -648,10 +648,10 @@ fi %{_bindir}/ceph_test_cls_version %{_bindir}/ceph_test_cors %{_bindir}/ceph_test_filejournal -%{_bindir}/ceph_test_filestore +%{_bindir}/ceph_test_objectstore %{_bindir}/ceph_test_filestore_idempotent %{_bindir}/ceph_test_filestore_idempotent_sequence -%{_bindir}/ceph_test_filestore_workloadgen +%{_bindir}/ceph_test_objectstore_workloadgen %{_bindir}/ceph_test_get_blkdev_size %{_bindir}/ceph_test_ioctls %{_bindir}/ceph_test_keyvaluedb_atomicity diff --git a/debian/ceph-test.install b/debian/ceph-test.install index d0da0d731bb..1f748cb3e37 100644 --- a/debian/ceph-test.install +++ b/debian/ceph-test.install @@ -35,10 +35,10 @@ 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_filestore +usr/bin/ceph_test_objectstore usr/bin/ceph_test_filestore_idempotent usr/bin/ceph_test_filestore_idempotent_sequence -usr/bin/ceph_test_filestore_workloadgen +usr/bin/ceph_test_objectstore_workloadgen usr/bin/ceph_test_ioctls usr/bin/ceph_test_keys usr/bin/ceph_test_keyvaluedb_atomicity diff --git a/src/test/objectstore/TestObjectStoreState.cc b/src/test/objectstore/TestObjectStoreState.cc index 34e25fb2e2c..37f99c7d310 100644 --- a/src/test/objectstore/TestObjectStoreState.cc +++ b/src/test/objectstore/TestObjectStoreState.cc @@ -27,7 +27,7 @@ #define dout_subsys ceph_subsys_filestore #undef dout_prefix -#define dout_prefix *_dout << "ceph_test_filestore_state " +#define dout_prefix *_dout << "ceph_test_objectstore_state " const coll_t TestObjectStoreState::META_COLL("meta"); const coll_t TestObjectStoreState::TEMP_COLL("temp"); diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc index e51678e3ea7..aa0b20b5e86 100644 --- a/src/test/objectstore/store_test.cc +++ b/src/test/objectstore/store_test.cc @@ -1062,5 +1062,5 @@ int main(int argc, char **argv) { } // Local Variables: -// compile-command: "cd ../.. ; make ceph_test_filestore ; ./ceph_test_filestore --gtest_filter=StoreTest.* --log-to-stderr=true --debug-filestore=20" +// compile-command: "cd ../.. ; make ceph_test_objectstore ; ./ceph_test_objectstore --gtest_filter=StoreTest.* --log-to-stderr=true --debug-filestore=20" // End: -- 2.47.3