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 1a588f1 Signed-off-by: Loic Dachary <[email protected]>
sahid · Feb 12, 2014 · 840e918 · 840e918
1 parent b88b257
commit 840e918
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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: