From b58d230369259552927635b91dd58ed066cabca7 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 26 Sep 2016 15:14:07 -0400 Subject: [PATCH] unittest_compression_*: remove lib dir hackery Signed-off-by: Sage Weil --- src/test/compressor/test_compression_plugin.cc | 4 ++-- .../compressor/test_compression_plugin_snappy.cc | 12 ++---------- src/test/compressor/test_compression_plugin_zlib.cc | 12 ++---------- 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/src/test/compressor/test_compression_plugin.cc b/src/test/compressor/test_compression_plugin.cc index 859cfef5ac538..c45fab8cca90e 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 b67354b24f396..8b70c8c447834 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 af87fa4c84d45..fec8421cd1110 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); -- 2.39.5