memaslap: mv src/bin/contrib => contrib/bin

[awesomized/libmemcached] / test / tests / bin / memaslap.cpp

diff --git a/test/tests/bin/memaslap.cpp b/test/tests/bin/memaslap.cpp
index ba511228ab5afca79c88f5d25645ece47bb2b534..0656a5105af369bc58fb16dd27daa4a064cf292b 100644 (file)
--- a/test/tests/bin/memaslap.cpp
+++ b/test/tests/bin/memaslap.cpp
@@ -7,7 +7,7 @@
 using Catch::Matchers::Contains;
 
 TEST_CASE("bin/memaslap") {
-  Shell sh{string{TESTING_ROOT "/../src/bin"}};
+  Shell sh{string{TESTING_ROOT "/../contrib/bin/memaslap"}};
 
   SECTION("no servers provided") {
     string output;
@@ -33,11 +33,13 @@ TEST_CASE("bin/memaslap") {
   SECTION("with servers") {
     auto test = MemcachedCluster::network();
     auto examples = {
-        " -T 2 -c 32 -t 2s -S 1s",
-        " -T 2 -c 32 -t 2s -v 0.2 -e 0.05 -b",
-        " -T 2 -c 32 -t 2s -w 40k -o 0.2",
-        " -T 2 -c 32 -t 2s -d 20 -P 40k",
-        " -T 2 -c 32 -t 2s -d 50 -a -n 10",
+        " -T 2 -c 8 -t 2s -S 1s",
+        " -T 2 -c 8 -t 2s -v 0.2 -e 0.05 -b",
+        " -T 2 -c 8 -t 2s -w 40k -o 0.2",
+        " -T 2 -c 8 -t 2s -d 20 -P 40k",
+#if 0
+        " -T 2 -c 8 -t 2s -d 50 -a -n 10",
+#endif
     };
     string servers{"-s "};
 
@@ -47,7 +49,9 @@ TEST_CASE("bin/memaslap") {
     for (const auto args : examples) {
       string output;
       INFO(args);
-      REQUIRE(sh.run("memaslap " + servers + args, output));
+      auto ok = sh.run("memaslap -b " + servers + args, output);
+      INFO(output);
+      REQUIRE(ok);
       REQUIRE_THAT(output, Contains("TPS"));
     }
   }