From: Sage Weil <sage@redhat.com>
Date: Mon, 26 Sep 2016 19:14:07 +0000 (-0400)
Subject: unittest_compression_*: remove lib dir hackery
X-Git-Tag: v11.0.1~89^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b58d230369259552927635b91dd58ed066cabca7;p=ceph.git

unittest_compression_*: remove lib dir hackery

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/test/compressor/test_compression_plugin.cc b/src/test/compressor/test_compression_plugin.cc
index 859cfef5ac5..c45fab8cca9 100644
--- a/src/test/compressor/test_compression_plugin.cc
+++ b/src/test/compressor/test_compression_plugin.cc
@@ -55,8 +55,8 @@ int main(int argc, char **argv) {
   common_init_finish(g_ceph_context);
 
   const char* env = getenv("CEPH_LIB");
-  string directory(env ? env : ".libs");
-  g_conf->set_val("plugin_dir", directory, false, false);
+  if (env)
+    g_conf->set_val("plugin_dir", env, false, false);
 
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
diff --git a/src/test/compressor/test_compression_plugin_snappy.cc b/src/test/compressor/test_compression_plugin_snappy.cc
index b67354b24f3..8b70c8c4478 100644
--- a/src/test/compressor/test_compression_plugin_snappy.cc
+++ b/src/test/compressor/test_compression_plugin_snappy.cc
@@ -39,16 +39,8 @@ int main(int argc, char **argv) {
   common_init_finish(g_ceph_context);
 
   const char* env = getenv("CEPH_LIB");
-  std::string directory(env ? env : ".libs");
-  string mkdir_compressor = "mkdir -p " + directory + "/compressor";
-  int r = system(mkdir_compressor.c_str());
-  (void)r;
-
-  string cp_libceph_snappy = "cp " + directory + "/libceph_snappy.so* " + directory + "/compressor/";
-  r = system(cp_libceph_snappy.c_str());
-  (void)r;
-
-  g_conf->set_val("plugin_dir", directory, false, false);
+  if (env)
+    g_conf->set_val("plugin_dir", env, false, false);
 
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
diff --git a/src/test/compressor/test_compression_plugin_zlib.cc b/src/test/compressor/test_compression_plugin_zlib.cc
index af87fa4c84d..fec8421cd11 100644
--- a/src/test/compressor/test_compression_plugin_zlib.cc
+++ b/src/test/compressor/test_compression_plugin_zlib.cc
@@ -38,16 +38,8 @@ int main(int argc, char **argv) {
   common_init_finish(g_ceph_context);
 
   const char* env = getenv("CEPH_LIB");
-  string directory(env ? env : ".libs");
-  string mkdir_compressor = "mkdir -p " + directory + "/compressor";
-  int r = system(mkdir_compressor.c_str());
-  (void)r;
-
-  string cp_libceph_zlib = "cp " + directory + "/libceph_zlib.so* " + directory + "/compressor/";
-  r = system(cp_libceph_zlib.c_str());
-  (void)r;
-
-  g_conf->set_val("plugin_dir", directory, false, false);
+  if (env)
+    g_conf->set_val("plugin_dir", env, false, false);
 
 
   ::testing::InitGoogleTest(&argc, argv);