cleanup: src/.libs -> build/lib

Clean up remaining traces of automake's .libs.  This makes unittest_*
tests easier to run by hand (mostly).

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

diff --git a/examples/rbd-replay/create-image b/examples/rbd-replay/create-image
index 1792e4c242d29aa99fe97f897e04df608593de95..87892678575bca847ad34f10fdef26e5d3ab08a1 100755 (executable)
--- a/examples/rbd-replay/create-image
+++ b/examples/rbd-replay/create-image
@@ -3,6 +3,6 @@
 pool=rbd
 image=my-image
 size=10G
-export LD_LIBRARY_PATH=../../src/.libs
+export LD_LIBRARY_PATH=../../build/lib
 #qemu-img create -f raw rbd:$pool/$image:conf=../../src/ceph.conf $size
 qemu-img convert linux-0.2.img -O raw rbd:$pool/$image:conf=../../src/ceph.conf

diff --git a/examples/rbd-replay/trace b/examples/rbd-replay/trace
index 9a73693c5cf404a75326aa29ab56f66ed0e5400a..43697b086a365e6b25ed0b89c189d63170da2eab 100755 (executable)
--- a/examples/rbd-replay/trace
+++ b/examples/rbd-replay/trace
@@ -5,6 +5,6 @@ lttng create -o traces librbd
 lttng enable-event -u 'librbd:*'
 lttng add-context -u -t pthread_id
 lttng start
-LD_LIBRARY_PATH=../../src/.libs/ qemu-system-i386 -m 1024 rbd:rbd/my-image:conf=../../src/ceph.conf
+LD_LIBRARY_PATH=../../build/lib qemu-system-i386 -m 1024 rbd:rbd/my-image:conf=../../src/ceph.conf
 lttng stop
 lttng view > trace.log

diff --git a/qa/libceph/Makefile b/qa/libceph/Makefile
index 05a0696cb1483b95945fd400abec4f5dc8498d04..06e1b990b50974109cf4c9d9322ad296f65f05a1 100644 (file)
--- a/qa/libceph/Makefile
+++ b/qa/libceph/Makefile
@@ -1,4 +1,4 @@
-CFLAGS = -Wall -Wextra -D_GNU_SOURCE -lcephfs -L../../src/.libs
+CFLAGS = -Wall -Wextra -D_GNU_SOURCE -lcephfs -L../../build/lib
 
 TARGETS = trivial_libceph 
 

diff --git a/qa/workunits/erasure-code/bench.sh b/qa/workunits/erasure-code/bench.sh
index 7f4030481f7059ac779392bec9e5c7a9fd9c6bd4..23914ef82d2e1b22a1e28afd65aae27cb96f2725 100755 (executable)
--- a/qa/workunits/erasure-code/bench.sh
+++ b/qa/workunits/erasure-code/bench.sh
@@ -18,7 +18,7 @@
 # Test that it works from sources with:
 #
 #  CEPH_ERASURE_CODE_BENCHMARK=src/ceph_erasure_code_benchmark  \
-#  PLUGIN_DIRECTORY=src/.libs \
+#  PLUGIN_DIRECTORY=build/lib \
 #      qa/workunits/erasure-code/bench.sh fplot jerasure |
 #      tee qa/workunits/erasure-code/bench.js
 #
@@ -38,7 +38,7 @@
 #
 #  TOTAL_SIZE=$((4 * 1024 * 1024 * 1024)) \
 #  CEPH_ERASURE_CODE_BENCHMARK=src/ceph_erasure_code_benchmark  \
-#  PLUGIN_DIRECTORY=src/.libs \
+#  PLUGIN_DIRECTORY=build/lib \
 #      qa/workunits/erasure-code/bench.sh fplot jerasure |
 #      tee qa/workunits/erasure-code/bench.js
 #
@@ -182,7 +182,7 @@ fi
 # Local Variables:
 # compile-command: "\
 #   CEPH_ERASURE_CODE_BENCHMARK=../../../src/ceph_erasure_code_benchmark \
-#   PLUGIN_DIRECTORY=../../../src/.libs \
+#   PLUGIN_DIRECTORY=../../../build/lib \
 #   ./bench.sh
 # "
 # End:

diff --git a/src/ceph-disk/tests/ceph-disk.sh b/src/ceph-disk/tests/ceph-disk.sh
index b03952fc1b2f6ab2ff94789b7ec3e5d44ef2f000..73b09809709d0007819076caf213806929a7b58d 100755 (executable)
--- a/src/ceph-disk/tests/ceph-disk.sh
+++ b/src/ceph-disk/tests/ceph-disk.sh
@@ -23,7 +23,7 @@
 if [ -z "$CEPH_ROOT" ] || [ -z "$CEPH_BIN" ] || [ -z "$CEPH_LIB" ]; then
     CEPH_ROOT=`readlink -f $(dirname $0)/../../..`
     CEPH_BIN=$CEPH_ROOT
-    CEPH_LIB=$CEPH_ROOT/.libs
+    CEPH_LIB=$CEPH_ROOT/build/lib
 fi
 source $CEPH_ROOT/qa/standalone/ceph-helpers.sh
 

diff --git a/src/test/compressor/test_compression.cc b/src/test/compressor/test_compression.cc
index 0802603124c01a1a37ca229cb05d78e4150368dc..b7ab9f0f65f3ee7a30ea18a93ff4199736d74e05 100644 (file)
--- a/src/test/compressor/test_compression.cc
+++ b/src/test/compressor/test_compression.cc
@@ -384,7 +384,7 @@ TEST(ZlibCompressor, zlib_isal_compatibility)
 TEST(CompressionPlugin, all)
 {
   const char* env = getenv("CEPH_LIB");
-  std::string directory(env ? env : ".libs");
+  std::string directory(env ? env : "lib");
   CompressorRef compressor;
   PluginRegistry *reg = g_ceph_context->get_plugin_registry();
   EXPECT_TRUE(reg);

diff --git a/src/test/erasure-code/TestErasureCodeLrc.cc b/src/test/erasure-code/TestErasureCodeLrc.cc
index 09370353691b676f0778523fc94e07dde103a750..5281bc562a95981f8eb7d65f9cbe9d5214db96e4 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 : ".libs");
+    string directory(env ? env : "lib");
     string description_string = 
       "[ " 
       "  [ \"_cDDD_cDD_\", \"directory=" + directory + "\" ]," 

diff --git a/src/test/erasure-code/TestErasureCodePlugin.cc b/src/test/erasure-code/TestErasureCodePlugin.cc
index 521169066ebb11ca979db43604646b5840711a62..6afdb964d745147df0a90d38c8cd67459eb59df1 100644 (file)
--- a/src/test/erasure-code/TestErasureCodePlugin.cc
+++ b/src/test/erasure-code/TestErasureCodePlugin.cc
@@ -83,7 +83,7 @@ TEST_F(ErasureCodePluginRegistryTest, all)
 {
   ErasureCodeProfile profile;
   const char* env = getenv("CEPH_LIB");
-  string directory(env ? env : ".libs");
+  string directory(env ? env : "lib");
   ErasureCodeInterfaceRef erasure_code;
   ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();
   EXPECT_FALSE(erasure_code);

diff --git a/src/test/erasure-code/TestErasureCodeShec_arguments.cc b/src/test/erasure-code/TestErasureCodeShec_arguments.cc
index ce7bd42f18b37e6c4d27368a39fae7aaaf6dd67a..1f09b9c9ca7c27d0e3bab187b1be4a6affe5521d 100644 (file)
--- a/src/test/erasure-code/TestErasureCodeShec_arguments.cc
+++ b/src/test/erasure-code/TestErasureCodeShec_arguments.cc
@@ -400,7 +400,7 @@ int main(int argc, char **argv)
   common_init_finish(g_ceph_context);
 
   const char* env = getenv("CEPH_LIB");
-  std::string directory(env ? env : ".libs");
+  std::string directory(env ? env : "lib");
   g_conf->set_val_or_die("erasure_code_dir", directory);
 
   ::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 e3a1582269c63c9c431472ce83e1c2e14988e085..993862cb55dec37e77fc566f07040f81f4dd1181 100644 (file)
--- a/src/test/erasure-code/ceph_erasure_code.cc
+++ b/src/test/erasure-code/ceph_erasure_code.cc
@@ -90,7 +90,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 : ".libs");
+  string directory(env ? env : "lib");
   g_conf->set_val_or_die("erasure_code_dir", directory);
 
   if (vm.count("help")) {

diff --git a/src/test/erasure-code/ceph_erasure_code_benchmark.cc b/src/test/erasure-code/ceph_erasure_code_benchmark.cc
index edb921c2081d90408cc3e294a8856cc72c75fb54..4d0fa9fcb8a4b8f0262482081201cf0309e67d83 100644 (file)
--- a/src/test/erasure-code/ceph_erasure_code_benchmark.cc
+++ b/src/test/erasure-code/ceph_erasure_code_benchmark.cc
@@ -345,7 +345,7 @@ int main(int argc, char** argv) {
  *   valgrind --tool=memcheck --leak-check=full \
  *      ./ceph_erasure_code_benchmark \
  *      --plugin jerasure \
- *      --parameter directory=.libs \
+ *      --parameter directory=lib \
  *      --parameter technique=reed_sol_van \
  *      --parameter k=2 \
  *      --parameter m=2 \

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 15482332e9b10e46c83ee904f495fc84cc54c38a..b9ae1ae253025551bb06ef4fda2790f02888fa4a 100644 (file)
--- a/src/test/erasure-code/ceph_erasure_code_non_regression.cc
+++ b/src/test/erasure-code/ceph_erasure_code_non_regression.cc
@@ -97,7 +97,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 : ".libs");
+  std::string libs_dir(env ? env : "lib");
   g_conf->set_val_or_die("erasure_code_dir", libs_dir);
 
   if (vm.count("help")) {

diff --git a/src/test/librados_test_stub/TestClassHandler.cc b/src/test/librados_test_stub/TestClassHandler.cc
index 739c3405bc23eec16dc45ea96faeb81a04212897..b8a32dfc5047cfb00430d7bf150ad6bee532cf24 100644 (file)
--- a/src/test/librados_test_stub/TestClassHandler.cc
+++ b/src/test/librados_test_stub/TestClassHandler.cc
@@ -47,7 +47,7 @@ void TestClassHandler::open_all_classes() {
   assert(m_class_handles.empty());
 
   const char* env = getenv("CEPH_LIB");
-  std::string CEPH_LIB(env ? env : ".libs");
+  std::string CEPH_LIB(env ? env : "lib");
   DIR *dir = ::opendir(CEPH_LIB.c_str());
   if (dir == NULL) {
     ceph_abort();;