X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=test%2Ftests%2Fbin%2Fmemaslap.cpp;h=0656a5105af369bc58fb16dd27daa4a064cf292b;hb=fd0f1940d4b11f582fc237ff5ccf2c385eaa0e7d;hp=e2c618297258b23bfe5c4cc5c836dca74188a77b;hpb=7e2b466107a65e22f1cc258ca8643922dbb60352;p=awesomized%2Flibmemcached diff --git a/test/tests/bin/memaslap.cpp b/test/tests/bin/memaslap.cpp index e2c61829..0656a510 100644 --- 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 2s -S 1s", - " -t 2s -v 0.2 -e 0.05 -b", - " -t 2s -w 40k -S 20s -o 0.2", - " -t 2s -T 4 -c 128 -d 20 -P 40k", - " -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")); } }