test/erasure-code: drop directory from profile

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

diff --git a/src/test/erasure-code/TestErasureCodeLrc.cc b/src/test/erasure-code/TestErasureCodeLrc.cc
index 405e074dc29ee83f9a7e65868fae76f586790212..772351c01dcb1ab45630475b5a3bbf5d9cbe67af 100644 (file)
--- a/src/test/erasure-code/TestErasureCodeLrc.cc
+++ b/src/test/erasure-code/TestErasureCodeLrc.cc
@@ -351,7 +351,6 @@ TEST(ErasureCodeLrc, layers_sanity_checks)
     ErasureCodeProfile profile;
     profile["mapping"] =
            "__DDD__DD";
-    profile["directory"] = ".libs";
     const char *description_string =
       "[ "
       "  [ \"_cDDD_cDD\", \"\" ],"
@@ -383,7 +382,6 @@ TEST(ErasureCodeLrc, layers_sanity_checks)
   {
     ErasureCodeLrc lrc(g_conf->erasure_code_dir);
     ErasureCodeProfile profile;
-    profile["directory"] = ".libs";
     profile["mapping"] =
            "DD";
     const char *description_string =
@@ -408,7 +406,6 @@ TEST(ErasureCodeLrc, layers_init)
       "  [ \"_cDDD_cDD_\", \"directory=.libs\" ],"
       "]";
     profile["layers"] = description_string;
-    profile["directory"] = ".libs";
     json_spirit::mArray description;
     EXPECT_EQ(0, lrc.layers_description(profile, &description, &cerr));
     EXPECT_EQ(0, lrc.layers_parse(description_string, description, &cerr));
@@ -433,7 +430,6 @@ TEST(ErasureCodeLrc, init)
     "  [ \"_____cDDD\", \"\" ],"
     "]";
   profile["layers"] = description_string;
-  profile["directory"] = ".libs";
   EXPECT_EQ(0, lrc.init(profile, &cerr));
 }
 
@@ -444,7 +440,6 @@ TEST(ErasureCodeLrc, init_kml)
   profile["k"] = "4";
   profile["m"] = "2";
   profile["l"] = "3";
-  profile["directory"] = ".libs";
   EXPECT_EQ(0, lrc.init(profile, &cerr));
   EXPECT_EQ((unsigned int)(4 + 2 + (4 + 2) / 3), lrc.get_chunk_count());
 }
@@ -464,7 +459,6 @@ TEST(ErasureCodeLrc, minimum_to_decode)
       "  [ \"_____cDDD\", \"\" ],"
       "]";
     profile["layers"] = description_string;
-    profile["directory"] = ".libs";
     EXPECT_EQ(0, lrc.init(profile, &cerr));
     set<int> want_to_read;
     want_to_read.insert(1);
@@ -489,7 +483,6 @@ TEST(ErasureCodeLrc, minimum_to_decode)
       "  [ \"_____DDDDc\", \"\" ],"
       "]";
     profile["layers"] = description_string;
-    profile["directory"] = ".libs";
     EXPECT_EQ(0, lrc.init(profile, &cerr));
     EXPECT_EQ(profile["mapping"].length(),
              lrc.get_chunk_count());
@@ -539,7 +532,6 @@ TEST(ErasureCodeLrc, minimum_to_decode)
       "  [ \"_____cDDD\", \"\" ],"
       "]";
     profile["layers"] = description_string;
-    profile["directory"] = ".libs";
     EXPECT_EQ(0, lrc.init(profile, &cerr));
     EXPECT_EQ(profile["mapping"].length(),
              lrc.get_chunk_count());
@@ -618,7 +610,6 @@ TEST(ErasureCodeLrc, encode_decode)
     "  [ \"____cDDD\", \"\" ]," // second local layer
     "]";
   profile["layers"] = description_string;
-  profile["directory"] = ".libs";
   EXPECT_EQ(0, lrc.init(profile, &cerr));
   EXPECT_EQ(4U, lrc.get_data_chunk_count());
   unsigned int stripe_width = g_conf->osd_pool_erasure_code_stripe_width;
@@ -749,7 +740,6 @@ TEST(ErasureCodeLrc, encode_decode_2)
     " [ \"____DDDc\", \"\" ],"
     "]";
   profile["layers"] = description_string;
-  profile["directory"] = ".libs";
   EXPECT_EQ(0, lrc.init(profile, &cerr));
   EXPECT_EQ(4U, lrc.get_data_chunk_count());
   unsigned int stripe_width = g_conf->osd_pool_erasure_code_stripe_width;

diff --git a/src/test/erasure-code/TestErasureCodePlugin.cc b/src/test/erasure-code/TestErasureCodePlugin.cc
index 130682744742d636eccdff120caf56340271d828..6cf241e448b9e90dd6f5c8a64e3c9d85b9ea9ef3 100644 (file)
--- a/src/test/erasure-code/TestErasureCodePlugin.cc
+++ b/src/test/erasure-code/TestErasureCodePlugin.cc
@@ -32,7 +32,6 @@ protected:
   public:
     virtual void *entry() {
       ErasureCodeProfile profile;
-      profile["directory"] = ".libs";
       ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();
       ErasureCodeInterfaceRef erasure_code;
       instance.factory("hangs",
@@ -76,7 +75,6 @@ TEST_F(ErasureCodePluginRegistryTest, all)
 {
   ErasureCodeProfile profile;
   string directory(".libs");
-  profile["directory"] = directory;
   ErasureCodeInterfaceRef erasure_code;
   ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();
   EXPECT_FALSE(erasure_code);

diff --git a/src/test/erasure-code/TestErasureCodePluginIsa.cc b/src/test/erasure-code/TestErasureCodePluginIsa.cc
index 7207bf415cfb991c77f0e50c0cfa062a85c95933..f1b0884c1463d7e949958f7a40f7f69274eb869a 100644 (file)
--- a/src/test/erasure-code/TestErasureCodePluginIsa.cc
+++ b/src/test/erasure-code/TestErasureCodePluginIsa.cc
@@ -26,7 +26,6 @@ TEST(ErasureCodePlugin, factory)
 {
   ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();
   ErasureCodeProfile profile;
-  profile["directory"] = ".libs";
   {
     ErasureCodeInterfaceRef erasure_code;
     EXPECT_FALSE(erasure_code);

diff --git a/src/test/erasure-code/TestErasureCodePluginJerasure.cc b/src/test/erasure-code/TestErasureCodePluginJerasure.cc
index 86df90d0076f196ba9b902c366449a5a42c1622c..1616ce667d8cad2e5e2015f51435568d2f7a9e27 100644 (file)
--- a/src/test/erasure-code/TestErasureCodePluginJerasure.cc
+++ b/src/test/erasure-code/TestErasureCodePluginJerasure.cc
@@ -30,7 +30,6 @@ TEST(ErasureCodePlugin, factory)
 {
   ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();
   ErasureCodeProfile profile;
-  profile["directory"] = ".libs";
   {
     ErasureCodeInterfaceRef erasure_code;
     EXPECT_FALSE(erasure_code);
@@ -53,7 +52,6 @@ TEST(ErasureCodePlugin, factory)
   for(const char **technique = techniques; *technique; technique++) {
     ErasureCodeInterfaceRef erasure_code;
     ErasureCodeProfile profile;
-    profile["directory"] = ".libs";
     profile["technique"] = *technique;
     EXPECT_FALSE(erasure_code);
     EXPECT_EQ(0, instance.factory("jerasure",
@@ -81,7 +79,6 @@ TEST(ErasureCodePlugin, select)
   // load test plugins instead of actual plugins to assert the desired side effect
   // happens
   profile["jerasure-name"] = "test_jerasure";
-  profile["directory"] = ".libs";
   profile["technique"] = "reed_sol_van";
 
   // all features are available, load the SSE4 plugin
@@ -200,7 +197,6 @@ TEST(ErasureCodePlugin, sse)
 
   ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();
   ErasureCodeProfile profile;
-  profile["directory"] = ".libs";
   profile["technique"] = "reed_sol_van";
   profile["k"] = "2";
   profile["m"] = "1";

diff --git a/src/test/erasure-code/TestErasureCodePluginLrc.cc b/src/test/erasure-code/TestErasureCodePluginLrc.cc
index df3c09f0aad2c3632b734539bbd83e52423bdb40..03abafcbf1c9ca4f3ace81b86007bd7fc6dcd3d4 100644 (file)
--- a/src/test/erasure-code/TestErasureCodePluginLrc.cc
+++ b/src/test/erasure-code/TestErasureCodePluginLrc.cc
@@ -29,7 +29,6 @@ TEST(ErasureCodePlugin, factory)
 {
   ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();
   ErasureCodeProfile profile;
-  profile["directory"] = ".libs";
   profile["mapping"] = "DD_";
   profile["layers"] = "[ [ \"DDc\", \"\" ] ]";
   ErasureCodeInterfaceRef erasure_code;

diff --git a/src/test/erasure-code/TestErasureCodePluginShec.cc b/src/test/erasure-code/TestErasureCodePluginShec.cc
index f0307c33fd542071984785700618f6bf479e4e4f..270815052b3879dd302cc33e4463d5fa9a89567d 100644 (file)
--- a/src/test/erasure-code/TestErasureCodePluginShec.cc
+++ b/src/test/erasure-code/TestErasureCodePluginShec.cc
@@ -31,7 +31,6 @@ TEST(ErasureCodePlugin, factory)
 {
   ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();
   map<std::string,std::string> profile;
-  profile["directory"] = ".libs";
   {
     ErasureCodeInterfaceRef erasure_code;
     EXPECT_FALSE(erasure_code);
@@ -48,7 +47,6 @@ TEST(ErasureCodePlugin, factory)
   };
   for(const char **technique = techniques; *technique; technique++) {
     ErasureCodeInterfaceRef erasure_code;
-    profile["directory"] = ".libs";
     profile["technique"] = *technique;
     EXPECT_FALSE(erasure_code);
     EXPECT_EQ(0, instance.factory("shec",
@@ -76,7 +74,6 @@ TEST(ErasureCodePlugin, select)
   // load test plugins instead of actual plugins to assert the desired side effect
   // happens
   profile["shec-name"] = "test_shec";
-  profile["directory"] = ".libs";
   profile["technique"] = "multiple";
 
   // all features are available, load the SSE4 plugin
@@ -195,7 +192,6 @@ TEST(ErasureCodePlugin, sse)
 
   ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();
   map<std::string,std::string> profile;
-  profile["directory"] = ".libs";
   profile["technique"] = "multiple";
   profile["k"] = "2";
   profile["m"] = "1";

diff --git a/src/test/erasure-code/TestErasureCodeShec.cc b/src/test/erasure-code/TestErasureCodeShec.cc
index 3029fde12fc7a112f7d0473c63362b67fbab6ef3..1f87505aad464b0632042d7f826db2ef56370b0d 100644 (file)
--- a/src/test/erasure-code/TestErasureCodeShec.cc
+++ b/src/test/erasure-code/TestErasureCodeShec.cc
@@ -49,7 +49,6 @@ TEST(ErasureCodeShec, init_1)
   ErasureCodeProfile *profile = new ErasureCodeProfile();
   (*profile)["plugin"] = "shec";
   (*profile)["technique"] = "";
-  (*profile)["directory"] = "/usr/lib64/ceph/erasure-code";
   (*profile)["ruleset-failure-domain"] = "osd";
   (*profile)["k"] = "4";
   (*profile)["m"] = "3";
@@ -249,7 +248,6 @@ TEST(ErasureCodeShec, init_8)
                                  ErasureCodeShec::MULTIPLE);
   ErasureCodeProfile *profile = new ErasureCodeProfile();
   (*profile)["plugin"] = "shec";
-  (*profile)["directory"] = "/usr/lib64/";     //unexpected value
   (*profile)["technique"] = "";
   (*profile)["ruleset-failure-domain"] = "osd";
   (*profile)["k"] = "4";

diff --git a/src/test/erasure-code/TestErasureCodeShec_all.cc b/src/test/erasure-code/TestErasureCodeShec_all.cc
index e968467a5a88aa026a1314fd250a85bb25158ab2..6e9a743e4564d37652d1d674b550dc7de1c599fc 100644 (file)
--- a/src/test/erasure-code/TestErasureCodeShec_all.cc
+++ b/src/test/erasure-code/TestErasureCodeShec_all.cc
@@ -76,7 +76,6 @@ TEST_P(ParameterTest, parameter_all)
   ErasureCodeProfile *profile = new ErasureCodeProfile();
   (*profile)["plugin"] = "shec";
   (*profile)["technique"] = "";
-  (*profile)["directory"] = "/usr/lib64/ceph/erasure-code";
   (*profile)["ruleset-failure-domain"] = "osd";
   (*profile)["k"] = k;
   (*profile)["m"] = m;

diff --git a/src/test/erasure-code/TestErasureCodeShec_arguments.cc b/src/test/erasure-code/TestErasureCodeShec_arguments.cc
index 4f0e56e2dfb14bf73ce710703c5aedbb19e2f6c5..5d2f494dc14b41340e393d85fc9fbee1a435d5e6 100644 (file)
--- a/src/test/erasure-code/TestErasureCodeShec_arguments.cc
+++ b/src/test/erasure-code/TestErasureCodeShec_arguments.cc
@@ -188,7 +188,6 @@ TEST(ParameterTest, combination_all)
                                                         std::string>();
   (*profile)["plugin"] = "shec";
   (*profile)["technique"] = "";
-  (*profile)["directory"] = "/usr/lib64/ceph/erasure-code";
   (*profile)["ruleset-failure-domain"] = "osd";
   (*profile)["k"] = k;
   (*profile)["m"] = m;

diff --git a/src/test/erasure-code/ceph_erasure_code.cc b/src/test/erasure-code/ceph_erasure_code.cc
index 243818a5b546c4bd70d97ec07f5719d7041939a9..fd688d542e080c073027e02a730caf7c127cae86 100644 (file)
--- a/src/test/erasure-code/ceph_erasure_code.cc
+++ b/src/test/erasure-code/ceph_erasure_code.cc
@@ -110,9 +110,6 @@ int ErasureCodeCommand::setup(int argc, char** argv) {
     }
   }
 
-  if (profile.count("directory") == 0)
-    profile["directory"] = ".libs";
-
   return 0;
 }
 

diff --git a/src/test/erasure-code/ceph_erasure_code_benchmark.cc b/src/test/erasure-code/ceph_erasure_code_benchmark.cc
index 0eb00e889bb50e474261061f4f215ba5c3cec99a..31a73d45a9fd3916b0466fb382124f1e64ae2f18 100644 (file)
--- a/src/test/erasure-code/ceph_erasure_code_benchmark.cc
+++ b/src/test/erasure-code/ceph_erasure_code_benchmark.cc
@@ -108,9 +108,6 @@ int ErasureCodeBench::setup(int argc, char** argv) {
     }
   }
 
-  if (profile.count("directory") == 0)
-    profile["directory"] = ".libs";
-
   in_size = vm["size"].as<int>();
   max_iterations = vm["iterations"].as<int>();
   plugin = vm["plugin"].as<string>();

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 054de7ec81c69342499250852ec8a0a931c82969..91e251f2eeeede606ed5ecdc0210d88014456b9a 100644 (file)
--- a/src/test/erasure-code/ceph_erasure_code_non_regression.cc
+++ b/src/test/erasure-code/ceph_erasure_code_non_regression.cc
@@ -136,17 +136,13 @@ int ErasureCodeNonRegression::setup(int argc, char** argv) {
       } else {
        profile[strs[0]] = strs[1];
       }
-      if (strs[0] != "directory")
-       directory += " " + *i;
+      directory += " " + *i;
     }
   }
 
   if (vm.count("path"))
     directory = vm["path"].as<string>();
 
-  if (profile.count("directory") == 0)
-    profile["directory"] = ".libs";
-
   return 0;
 }