From a6433cc4900ec1ee22edb23f6cc6905d4e7eba37 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Mon, 23 Nov 2015 20:21:42 +0100 Subject: [PATCH] qa: erasure-code has --erasure-code-dir It is used instead of the obsoleted --parameter directory= to specify the location of the erasure code directory plugins. Signed-off-by: Loic Dachary --- qa/workunits/erasure-code/bench.sh | 3 ++- src/test/erasure-code/ceph_erasure_code.cc | 1 - src/test/erasure-code/ceph_erasure_code_benchmark.cc | 1 - src/test/erasure-code/ceph_erasure_code_non_regression.cc | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/qa/workunits/erasure-code/bench.sh b/qa/workunits/erasure-code/bench.sh index acd70354edcd..31fc1f98e38c 100755 --- a/qa/workunits/erasure-code/bench.sh +++ b/qa/workunits/erasure-code/bench.sh @@ -1,5 +1,6 @@ #!/bin/bash # +# Copyright (C) 2015 Red Hat # Copyright (C) 2013,2014 Cloudwatt # # Author: Loic Dachary @@ -80,7 +81,7 @@ function bench() { --erasures $erasures \ --parameter k=$k \ --parameter m=$m \ - --parameter directory=$PLUGIN_DIRECTORY) + --erasure-code-dir $PLUGIN_DIRECTORY) result=$($command "$@") echo -e "$result\t$plugin\t$k\t$m\t$workload\t$iterations\t$size\t$erasures\t$command ""$@" } diff --git a/src/test/erasure-code/ceph_erasure_code.cc b/src/test/erasure-code/ceph_erasure_code.cc index 00d44964760a..a48836657d22 100644 --- a/src/test/erasure-code/ceph_erasure_code.cc +++ b/src/test/erasure-code/ceph_erasure_code.cc @@ -188,7 +188,6 @@ int main(int argc, char** argv) { * libtool --mode=execute valgrind --tool=memcheck --leak-check=full \ * ./ceph_erasure_code \ * --parameter plugin=jerasure \ - * --parameter directory=.libs \ * --parameter technique=reed_sol_van \ * --parameter k=2 \ * --parameter m=2 \ diff --git a/src/test/erasure-code/ceph_erasure_code_benchmark.cc b/src/test/erasure-code/ceph_erasure_code_benchmark.cc index 052d8fef2214..31a73d45a9fd 100644 --- a/src/test/erasure-code/ceph_erasure_code_benchmark.cc +++ b/src/test/erasure-code/ceph_erasure_code_benchmark.cc @@ -87,7 +87,6 @@ int ErasureCodeBench::setup(int argc, char** argv) { CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); g_ceph_context->_conf->apply_changes(NULL); - g_conf->set_val("erasure_code_dir", ".libs", false, false); if (vm.count("help")) { cout << desc << std::endl; 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 91e251f2eeee..bc65123d58ba 100644 --- a/src/test/erasure-code/ceph_erasure_code_non_regression.cc +++ b/src/test/erasure-code/ceph_erasure_code_non_regression.cc @@ -330,7 +330,6 @@ int main(int argc, char** argv) { * libtool --mode=execute valgrind --tool=memcheck --leak-check=full \ * ./ceph_erasure_code_non_regression \ * --plugin jerasure \ - * --parameter directory=.libs \ * --parameter technique=reed_sol_van \ * --parameter k=2 \ * --parameter m=2 \ -- 2.47.3