test_store: parse args, don't link librados

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/Makefile.am b/src/Makefile.am
index 2eaf84e3076c8086926438e8ad63a511d58f82b1..e6c7d48f2a71c16b558090094117ceff50801562 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -631,7 +631,7 @@ bin_DEBUGPROGRAMS += test_rados_api_misc
 
 test_store_SOURCES = test/store_test.cc
 test_store_LDFLAGS = ${AM_LDFLAGS}
-test_store_LDADD =  librados.la ${UNITTEST_STATIC_LDADD} libos.la $(LIBGLOBAL_LDA)
+test_store_LDADD =  ${UNITTEST_STATIC_LDADD} libos.la $(LIBGLOBAL_LDA)
 test_store_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 bin_DEBUGPROGRAMS += test_store
 

diff --git a/src/test/store_test.cc b/src/test/store_test.cc
index 4ddb042c587e4b2f88733110d320b866f62a5df1..568fa1296c8764004ffb37c0fccd4862a8153c28 100644 (file)
--- a/src/test/store_test.cc
+++ b/src/test/store_test.cc
@@ -524,7 +524,8 @@ TEST_F(StoreTest, HashCollisionTest) {
 
 int main(int argc, char **argv) {
   vector<const char*> args;
-  
+  argv_to_vec(argc, (const char **)argv, args);
+
   global_init(args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0);
   common_init_finish(g_ceph_context);
   g_ceph_context->_conf->set_val("osd_journal_size", "400");