From d4cc161566cff9adefc76eda2fb628901530eae7 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 1 Dec 2017 17:11:46 -0600 Subject: [PATCH] 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 --- examples/rbd-replay/create-image | 2 +- examples/rbd-replay/trace | 2 +- qa/libceph/Makefile | 2 +- qa/workunits/erasure-code/bench.sh | 6 +++--- src/ceph-disk/tests/ceph-disk.sh | 2 +- src/test/compressor/test_compression.cc | 2 +- src/test/erasure-code/TestErasureCodeLrc.cc | 2 +- src/test/erasure-code/TestErasureCodePlugin.cc | 2 +- src/test/erasure-code/TestErasureCodeShec_arguments.cc | 2 +- src/test/erasure-code/ceph_erasure_code.cc | 2 +- src/test/erasure-code/ceph_erasure_code_benchmark.cc | 2 +- src/test/erasure-code/ceph_erasure_code_non_regression.cc | 2 +- src/test/librados_test_stub/TestClassHandler.cc | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/rbd-replay/create-image b/examples/rbd-replay/create-image index 1792e4c242d29..87892678575bc 100755 --- 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 9a73693c5cf40..43697b086a365 100755 --- 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 05a0696cb1483..06e1b990b5097 100644 --- 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 7f4030481f705..23914ef82d2e1 100755 --- 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 b03952fc1b2f6..73b09809709d0 100755 --- 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 0802603124c01..b7ab9f0f65f3e 100644 --- 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 09370353691b6..5281bc562a959 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 : ".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 521169066ebb1..6afdb964d7451 100644 --- 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 ce7bd42f18b37..1f09b9c9ca7c2 100644 --- 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 e3a1582269c63..993862cb55dec 100644 --- 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 edb921c2081d9..4d0fa9fcb8a4b 100644 --- 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 15482332e9b10..b9ae1ae253025 100644 --- 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 739c3405bc23e..b8a32dfc5047c 100644 --- 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();;