cmake: CEPH_LIB defaults to .libs in cpp unit tests

This makes it possible to run applicable unit tests
without setting environment varibles after building
with autotools.

This will be reverted once autotools is deprecated.

Signed-off-by: Ali Maredia <amaredia@redhat.com>

diff --git a/src/test/common/test_async_compressor.cc b/src/test/common/test_async_compressor.cc
index 677a410302c87f731074832a6da6851562228ad6..11b612c53412fe8b25330cbc9fae5ff9fa7e1a25 100644 (file)
--- 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 45cffafaf318a7073fc5cf3053b283558b9d2c2a..51b60a107589df89b255174c655b28e5e74355e7 100644 (file)
--- 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 9e733f4396fcb00cfdbd5ac89697c5a04c502563..b67354b24f396bac4919c14fa9b0f8a181a916bf 100644 (file)
--- 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 5af5d14aa3c08372fa13c9762d6317406d5f5c30..af87fa4c84d45e6e54720aa6685a631610e201a6 100644 (file)
--- 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 bbd315cf308879503f92b136874f1a084172df79..71955cc6030bcdbf08a3fe0c12b33317b5c9f6e0 100644 (file)
--- 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 6ba64452f9ba783d380af02d31ecd042902eeb83..49cf720974f62e739989486558251b623c70e1e5 100644 (file)
--- 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 56759c4af1899c9a660744f07c434bc449187453..47b7fa2a87a5bab67b9d9fb6fc26e63dc742d84e 100644 (file)
--- 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 eff590f479c7e026f4b1a6c50ac843c2a82b991e..ed34e07ee987d7d7321f399e3ed3d5831ac84bb2 100644 (file)
--- 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 9c01e951c681766ce0a31542bd0d289e2d1d456b..2c927e23eb525f021fb9f626d7a8c685033b2e9f 100644 (file)
--- 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 52d7c685e840b96aa4942a78ca40e4cc53997c7e..c8f0e37da87237cf46b92ad56b8feb5481574ed3 100644 (file)
--- 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 b9452310af669d11768c3d78ef303aaa5c23f584..758fd8e9e192ff37d6bbbdc166db74782693c4d5 100644 (file)
--- 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 45f1b28168077526f19303beadb12d0d947dfb0c..42cf13d0fcdfffb301979b19f7203c724464b42b 100644 (file)
--- 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 1044017df9565937fa7dd6d62ec90f847fd411a5..e7f3e0821a477fab309dacc691f9b98b968a6e43 100644 (file)
--- 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 f43f296b1fca70d173aaa191c5b30a5bc58b46fe..6c06ccfd75f9b51358d9eff275ca98d789a9efda 100644 (file)
--- 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 f88d1cd4fa35581e0b2d4b58e087922e2a1fcc51..a90e4cb8f5557e141f29adb01f3238a12d0a1c2b 100644 (file)
--- 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 39d552b0111ce8bd8edd6e9aac1f35550a79513d..abd116ca7007625b41224aa8bbbb1c8111a39e94 100644 (file)
--- 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 8da9e69850ae6660f8d55cded1c0eddeee8a894e..a2ab31e8fd14d90ee7c4899279d203a81994462a 100644 (file)
--- 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 c8715ebe516e6a131e25e53e2e29074f92629772..14d904ddeb34a130aed79b68da7097c8272bb8ac 100644 (file)
--- 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 ea68ab24b0bcc77f0567289f152163bba9fcfdd6..597c479fa7e2ba724e3485894c3311d379e7286f 100644 (file)
--- 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 3adab597b872535c66a07200df509b8bea8d564c..0dc1b82c2b3ed703488c9942b232e55321c52091 100644 (file)
--- 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 aaa4304b9b75f23d324aee8af87d72015a6a733a..e3c3030bf4e8209efb9509895cc6a8ad586568b8 100644 (file)
--- 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 7b0fa2fe72d338364607b0f1791fd8de9f2862bd..dc4602529beb9bafc13ec83996c3068206771b2f 100644 (file)
--- 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 ea595ab1247a0e61adf55b355e1bf3475873f263..bf6634dbf022c8d854dfe61a4223e436f6062912 100644 (file)
--- 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);;