diff options
23 files changed, 26 insertions, 26 deletions
diff --git a/src/test/common/test_async_compressor.cc b/src/test/common/test_async_compressor.cc index 677a410302c..11b612c5341 100644 --- a/src/test/common/test_async_compressor.cc +++ b/src/test/common/test_async_compressor.cc @@ -211,7 +211,7 @@ int main(int argc, char **argv) { common_init_finish(g_ceph_context); const char* env = getenv("CEPH_LIB"); - string directory(env ? env : "lib"); + string directory(env ? env : ".libs"); // copy libceph_snappy.so into $plugin_dir/compressor for PluginRegistry // TODO: just build the compressor plugins in this subdir diff --git a/src/test/compressor/test_compression_plugin.cc b/src/test/compressor/test_compression_plugin.cc index 45cffafaf31..51b60a10758 100644 --- a/src/test/compressor/test_compression_plugin.cc +++ b/src/test/compressor/test_compression_plugin.cc @@ -28,7 +28,7 @@ TEST(CompressionPlugin, all) { const char* env = getenv("CEPH_LIB"); - std::string directory(env ? env : "lib"); + std::string directory(env ? env : ".libs"); CompressorRef compressor; PluginRegistry *reg = g_ceph_context->get_plugin_registry(); EXPECT_TRUE(reg); @@ -55,7 +55,7 @@ int main(int argc, char **argv) { common_init_finish(g_ceph_context); const char* env = getenv("CEPH_LIB"); - string directory(env ? env : "lib"); + string directory(env ? env : ".libs"); string mkdir_compressor = "mkdir -p " + directory + "/compressor"; int r = system(mkdir_compressor.c_str()); (void)r; diff --git a/src/test/compressor/test_compression_plugin_snappy.cc b/src/test/compressor/test_compression_plugin_snappy.cc index 9e733f4396f..b67354b24f3 100644 --- a/src/test/compressor/test_compression_plugin_snappy.cc +++ b/src/test/compressor/test_compression_plugin_snappy.cc @@ -39,7 +39,7 @@ int main(int argc, char **argv) { common_init_finish(g_ceph_context); const char* env = getenv("CEPH_LIB"); - std::string directory(env ? env : "lib"); + std::string directory(env ? env : ".libs"); string mkdir_compressor = "mkdir -p " + directory + "/compressor"; int r = system(mkdir_compressor.c_str()); (void)r; diff --git a/src/test/compressor/test_compression_plugin_zlib.cc b/src/test/compressor/test_compression_plugin_zlib.cc index 5af5d14aa3c..af87fa4c84d 100644 --- a/src/test/compressor/test_compression_plugin_zlib.cc +++ b/src/test/compressor/test_compression_plugin_zlib.cc @@ -38,7 +38,7 @@ int main(int argc, char **argv) { common_init_finish(g_ceph_context); const char* env = getenv("CEPH_LIB"); - string directory(env ? env : "lib"); + string directory(env ? env : ".libs"); string mkdir_compressor = "mkdir -p " + directory + "/compressor"; int r = system(mkdir_compressor.c_str()); (void)r; diff --git a/src/test/compressor/test_compression_snappy.cc b/src/test/compressor/test_compression_snappy.cc index bbd315cf308..71955cc6030 100644 --- a/src/test/compressor/test_compression_snappy.cc +++ b/src/test/compressor/test_compression_snappy.cc @@ -78,7 +78,7 @@ int main(int argc, char **argv) { common_init_finish(g_ceph_context); const char* env = getenv("CEPH_LIB"); - string directory(env ? env : "lib"); + string directory(env ? env : ".libs"); g_conf->set_val("plugin_dir", directory, false, false); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/compressor/test_compression_zlib.cc b/src/test/compressor/test_compression_zlib.cc index 6ba64452f9b..49cf720974f 100644 --- a/src/test/compressor/test_compression_zlib.cc +++ b/src/test/compressor/test_compression_zlib.cc @@ -70,7 +70,7 @@ int main(int argc, char **argv) { common_init_finish(g_ceph_context); const char* env = getenv("CEPH_LIB"); - string directory(env ? env : "lib"); + string directory(env ? env : ".libs"); g_conf->set_val("compression_dir", directory, false, false); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/erasure-code/TestErasureCode.cc b/src/test/erasure-code/TestErasureCode.cc index 56759c4af18..47b7fa2a87a 100644 --- a/src/test/erasure-code/TestErasureCode.cc +++ b/src/test/erasure-code/TestErasureCode.cc @@ -162,7 +162,7 @@ int main(int argc, char **argv) common_init_finish(g_ceph_context); const char* env = getenv("CEPH_LIB"); - string directory(env ? env : "lib"); + string directory(env ? env : ".libs"); g_conf->set_val("erasure_code_dir", directory, false, false); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/erasure-code/TestErasureCodeExample.cc b/src/test/erasure-code/TestErasureCodeExample.cc index eff590f479c..ed34e07ee98 100644 --- a/src/test/erasure-code/TestErasureCodeExample.cc +++ b/src/test/erasure-code/TestErasureCodeExample.cc @@ -242,7 +242,7 @@ int main(int argc, char **argv) { common_init_finish(g_ceph_context); const char* env = getenv("CEPH_LIB"); - string directory(env ? env : "lib"); + string directory(env ? env : ".libs"); g_conf->set_val("erasure_code_dir", directory, false, false); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/erasure-code/TestErasureCodeIsa.cc b/src/test/erasure-code/TestErasureCodeIsa.cc index 9c01e951c68..2c927e23eb5 100644 --- a/src/test/erasure-code/TestErasureCodeIsa.cc +++ b/src/test/erasure-code/TestErasureCodeIsa.cc @@ -964,7 +964,7 @@ int main(int argc, char **argv) common_init_finish(g_ceph_context); const char* env = getenv("CEPH_LIB"); - string directory(env ? env : "lib"); + string directory(env ? env : ".libs"); g_conf->set_val("erasure_code_dir", directory, false, false); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/erasure-code/TestErasureCodeJerasure.cc b/src/test/erasure-code/TestErasureCodeJerasure.cc index 52d7c685e84..c8f0e37da87 100644 --- a/src/test/erasure-code/TestErasureCodeJerasure.cc +++ b/src/test/erasure-code/TestErasureCodeJerasure.cc @@ -366,7 +366,7 @@ int main(int argc, char **argv) common_init_finish(g_ceph_context); const char* env = getenv("CEPH_LIB"); - string directory(env ? env : "lib"); + string directory(env ? env : ".libs"); g_conf->set_val("erasure_code_dir", directory, false, false); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/erasure-code/TestErasureCodeLrc.cc b/src/test/erasure-code/TestErasureCodeLrc.cc index b9452310af6..758fd8e9e19 100644 --- a/src/test/erasure-code/TestErasureCodeLrc.cc +++ b/src/test/erasure-code/TestErasureCodeLrc.cc @@ -403,7 +403,7 @@ TEST(ErasureCodeLrc, layers_init) ErasureCodeProfile profile; const char* env = getenv("CEPH_LIB"); - string directory(env ? env : "lib"); + string directory(env ? env : ".libs"); string description_string = "[ " " [ \"_cDDD_cDD_\", \"directory=" + directory + "\" ]," @@ -917,7 +917,7 @@ int main(int argc, char **argv) common_init_finish(g_ceph_context); const char* env = getenv("CEPH_LIB"); - string directory(env ? env : "lib"); + string directory(env ? env : ".libs"); g_conf->set_val("erasure_code_dir", directory, false, false); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/erasure-code/TestErasureCodePlugin.cc b/src/test/erasure-code/TestErasureCodePlugin.cc index 45f1b281680..42cf13d0fcd 100644 --- a/src/test/erasure-code/TestErasureCodePlugin.cc +++ b/src/test/erasure-code/TestErasureCodePlugin.cc @@ -84,7 +84,7 @@ TEST_F(ErasureCodePluginRegistryTest, all) { ErasureCodeProfile profile; const char* env = getenv("CEPH_LIB"); - string directory(env ? env : "lib"); + string directory(env ? env : ".libs"); ErasureCodeInterfaceRef erasure_code; ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance(); EXPECT_FALSE(erasure_code); @@ -134,7 +134,7 @@ int main(int argc, char **argv) { common_init_finish(g_ceph_context); const char* env = getenv("CEPH_LIB"); - string directory(env ? env : "lib"); + string directory(env ? env : ".libs"); g_conf->set_val("erasure_code_dir", directory, false, false); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/erasure-code/TestErasureCodePluginIsa.cc b/src/test/erasure-code/TestErasureCodePluginIsa.cc index 1044017df95..e7f3e0821a4 100644 --- a/src/test/erasure-code/TestErasureCodePluginIsa.cc +++ b/src/test/erasure-code/TestErasureCodePluginIsa.cc @@ -61,7 +61,7 @@ int main(int argc, char **argv) common_init_finish(g_ceph_context); const char* env = getenv("CEPH_LIB"); - string directory(env ? env : "lib"); + string directory(env ? env : ".libs"); g_conf->set_val("erasure_code_dir", directory, false, false); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/erasure-code/TestErasureCodePluginJerasure.cc b/src/test/erasure-code/TestErasureCodePluginJerasure.cc index f43f296b1fc..6c06ccfd75f 100644 --- a/src/test/erasure-code/TestErasureCodePluginJerasure.cc +++ b/src/test/erasure-code/TestErasureCodePluginJerasure.cc @@ -258,7 +258,7 @@ int main(int argc, char **argv) common_init_finish(g_ceph_context); const char* env = getenv("CEPH_LIB"); - string directory(env ? env : "lib"); + string directory(env ? env : ".libs"); g_conf->set_val("erasure_code_dir", directory, false, false); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/erasure-code/TestErasureCodePluginLrc.cc b/src/test/erasure-code/TestErasureCodePluginLrc.cc index f88d1cd4fa3..a90e4cb8f55 100644 --- a/src/test/erasure-code/TestErasureCodePluginLrc.cc +++ b/src/test/erasure-code/TestErasureCodePluginLrc.cc @@ -49,7 +49,7 @@ int main(int argc, char **argv) common_init_finish(g_ceph_context); const char* env = getenv("CEPH_LIB"); - string directory(env ? env : "lib"); + string directory(env ? env : ".libs"); g_conf->set_val("erasure_code_dir", directory, false, false); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/erasure-code/TestErasureCodePluginShec.cc b/src/test/erasure-code/TestErasureCodePluginShec.cc index 39d552b0111..abd116ca700 100644 --- a/src/test/erasure-code/TestErasureCodePluginShec.cc +++ b/src/test/erasure-code/TestErasureCodePluginShec.cc @@ -254,7 +254,7 @@ int main(int argc, char **argv) common_init_finish(g_ceph_context); const char* env = getenv("CEPH_LIB"); - string directory(env ? env : "lib"); + string directory(env ? env : ".libs"); g_conf->set_val("erasure_code_dir", directory, false, false); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/erasure-code/TestErasureCodeShec.cc b/src/test/erasure-code/TestErasureCodeShec.cc index 8da9e69850a..a2ab31e8fd1 100644 --- a/src/test/erasure-code/TestErasureCodeShec.cc +++ b/src/test/erasure-code/TestErasureCodeShec.cc @@ -2676,7 +2676,7 @@ int main(int argc, char **argv) common_init_finish(g_ceph_context); const char* env = getenv("CEPH_LIB"); - string directory(env ? env : "lib"); + string directory(env ? env : ".libs"); g_conf->set_val("erasure_code_dir", directory, false, false); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/erasure-code/TestErasureCodeShec_all.cc b/src/test/erasure-code/TestErasureCodeShec_all.cc index c8715ebe516..14d904ddeb3 100644 --- a/src/test/erasure-code/TestErasureCodeShec_all.cc +++ b/src/test/erasure-code/TestErasureCodeShec_all.cc @@ -298,7 +298,7 @@ int main(int argc, char **argv) common_init_finish(g_ceph_context); const char* env = getenv("CEPH_LIB"); - string directory(env ? env : "lib"); + string directory(env ? env : ".libs"); g_conf->set_val("erasure_code_dir", directory, false, false); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/erasure-code/TestErasureCodeShec_arguments.cc b/src/test/erasure-code/TestErasureCodeShec_arguments.cc index ea68ab24b0b..597c479fa7e 100644 --- a/src/test/erasure-code/TestErasureCodeShec_arguments.cc +++ b/src/test/erasure-code/TestErasureCodeShec_arguments.cc @@ -397,7 +397,7 @@ int main(int argc, char **argv) common_init_finish(g_ceph_context); const char* env = getenv("CEPH_LIB"); - std::string directory(env ? env : "lib"); + std::string directory(env ? env : ".libs"); g_conf->set_val("erasure_code_dir", directory, false, false); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/erasure-code/TestErasureCodeShec_thread.cc b/src/test/erasure-code/TestErasureCodeShec_thread.cc index 3adab597b87..0dc1b82c2b3 100644 --- a/src/test/erasure-code/TestErasureCodeShec_thread.cc +++ b/src/test/erasure-code/TestErasureCodeShec_thread.cc @@ -95,7 +95,7 @@ int main(int argc, char **argv) common_init_finish(g_ceph_context); const char* env = getenv("CEPH_LIB"); - std::string directory(env ? env : "lib"); + std::string directory(env ? env : ".libs"); g_conf->set_val("erasure_code_dir", directory, false, false); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/test/erasure-code/ceph_erasure_code.cc b/src/test/erasure-code/ceph_erasure_code.cc index aaa4304b9b7..e3c3030bf4e 100644 --- a/src/test/erasure-code/ceph_erasure_code.cc +++ b/src/test/erasure-code/ceph_erasure_code.cc @@ -89,7 +89,7 @@ int ErasureCodeCommand::setup(int argc, char** argv) { common_init_finish(g_ceph_context); g_ceph_context->_conf->apply_changes(NULL); const char* env = getenv("CEPH_LIB"); - string directory(env ? env : "lib"); + string directory(env ? env : ".libs"); g_conf->set_val("erasure_code_dir", directory, false, false); if (vm.count("help")) { diff --git a/src/test/erasure-code/ceph_erasure_code_non_regression.cc b/src/test/erasure-code/ceph_erasure_code_non_regression.cc index 7b0fa2fe72d..dc4602529be 100644 --- a/src/test/erasure-code/ceph_erasure_code_non_regression.cc +++ b/src/test/erasure-code/ceph_erasure_code_non_regression.cc @@ -101,7 +101,7 @@ int ErasureCodeNonRegression::setup(int argc, char** argv) { common_init_finish(g_ceph_context); g_ceph_context->_conf->apply_changes(NULL); const char* env = getenv("CEPH_LIB"); - std::string libs_dir(env ? env : "lib"); + std::string libs_dir(env ? env : ".libs"); g_conf->set_val("erasure_code_dir", libs_dir, false, false); if (vm.count("help")) { diff --git a/src/test/librados_test_stub/TestClassHandler.cc b/src/test/librados_test_stub/TestClassHandler.cc index ea595ab1247..bf6634dbf02 100644 --- a/src/test/librados_test_stub/TestClassHandler.cc +++ b/src/test/librados_test_stub/TestClassHandler.cc @@ -46,7 +46,7 @@ void TestClassHandler::open_all_classes() { assert(m_class_handles.empty()); const char* env = getenv("CEPH_LIB"); - std::string CEPH_LIB(env ? env : "lib"); + std::string CEPH_LIB(env ? env : ".libs"); DIR *dir = ::opendir(CEPH_LIB.c_str()); if (dir == NULL) { assert(false);; |