diff options
Diffstat (limited to 'vbench/src/tests/app_vbench/app_vbench_test.cpp')
-rw-r--r-- | vbench/src/tests/app_vbench/app_vbench_test.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vbench/src/tests/app_vbench/app_vbench_test.cpp b/vbench/src/tests/app_vbench/app_vbench_test.cpp index 366fe4ce871..00645045fb3 100644 --- a/vbench/src/tests/app_vbench/app_vbench_test.cpp +++ b/vbench/src/tests/app_vbench/app_vbench_test.cpp @@ -2,6 +2,7 @@ #include <vespa/vespalib/testkit/testapp.h> #include <vbench/test/all.h> #include <vespa/vespalib/util/slaveproc.h> +#include <vespa/vespalib/net/crypto_engine.h> using namespace vbench; using vespalib::SlaveProc; @@ -9,6 +10,8 @@ using vespalib::SlaveProc; using InputReader = vespalib::InputReader; using OutputWriter = vespalib::OutputWriter; +auto null_crypto = std::make_shared<vespalib::NullCryptoEngine>(); + bool endsWith(const Memory &mem, const string &str) { return (mem.size < str.size()) ? false : (strncmp(mem.data + mem.size - str.size(), str.data(), str.size()) == 0); @@ -35,7 +38,7 @@ TEST("vbench usage") { TEST_MT_F("run vbench", 2, ServerSocket()) { if (thread_id == 0) { for (;;) { - Stream::UP stream = f1.accept(); + Stream::UP stream = f1.accept(*null_crypto); if (stream.get() == 0) { break; } @@ -51,7 +54,7 @@ TEST_MT_F("run vbench", 2, ServerSocket()) { } } else { std::string out; - EXPECT_TRUE(SlaveProc::run(strfmt("sed -i 's/_LOCAL_PORT_/%d/' vbench.cfg", f1.port()).c_str())); + EXPECT_TRUE(SlaveProc::run(strfmt("sed 's/_LOCAL_PORT_/%d/' vbench.cfg.template > vbench.cfg", f1.port()).c_str())); EXPECT_TRUE(SlaveProc::run("../../apps/vbench/vbench_app run vbench.cfg 2> vbench.out", out)); fprintf(stderr, "%s\n", out.c_str()); f1.close(); |