From: Loic Dachary Date: Thu, 3 Sep 2015 15:27:18 +0000 (+0200) Subject: tests: ceph-erasure-code-corpus must test SIMD variants X-Git-Tag: v9.1.0~208^2^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50bc48b141dfe30c1f172cf5171cd668ac141b1c;p=ceph.git tests: ceph-erasure-code-corpus must test SIMD variants ceph_erasure_code.cc and ceph_erasure_code_benchmark.cc failed to load the plugins. It went unnoticed when 660ae5bcbb250b06cf88ec7f9a3f37b05c6c8118 was reviewed because * ceph_erasure_code_benchmark is not used in make check * qa/workunits/erasure-code/encode-decode-non-regression.sh silently interpreted the failure as the absence of SIMD variants http://tracker.ceph.com/issues/12933 Fixes: #12933 Signed-off-by: Loic Dachary --- diff --git a/ceph-erasure-code-corpus b/ceph-erasure-code-corpus index dc409e0b2095..b0d1137d31e4 160000 --- a/ceph-erasure-code-corpus +++ b/ceph-erasure-code-corpus @@ -1 +1 @@ -Subproject commit dc409e0b2095eeb960518ab9c8ee47a34264f4c1 +Subproject commit b0d1137d31e4b36b72ccae9c0a9a13de2ec82faa diff --git a/src/test/erasure-code/ceph_erasure_code.cc b/src/test/erasure-code/ceph_erasure_code.cc index fd688d542e08..00d44964760a 100644 --- a/src/test/erasure-code/ceph_erasure_code.cc +++ b/src/test/erasure-code/ceph_erasure_code.cc @@ -88,6 +88,7 @@ int ErasureCodeCommand::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_benchmark.cc b/src/test/erasure-code/ceph_erasure_code_benchmark.cc index 31a73d45a9fd..052d8fef2214 100644 --- a/src/test/erasure-code/ceph_erasure_code_benchmark.cc +++ b/src/test/erasure-code/ceph_erasure_code_benchmark.cc @@ -87,6 +87,7 @@ 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;