summaryrefslogtreecommitdiffstats
path: root/vbench/src/tests/app_dumpurl/app_dumpurl_test.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'vbench/src/tests/app_dumpurl/app_dumpurl_test.cpp')
-rw-r--r--vbench/src/tests/app_dumpurl/app_dumpurl_test.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/vbench/src/tests/app_dumpurl/app_dumpurl_test.cpp b/vbench/src/tests/app_dumpurl/app_dumpurl_test.cpp
index 0d5ee1e507c..3dc01725a3e 100644
--- a/vbench/src/tests/app_dumpurl/app_dumpurl_test.cpp
+++ b/vbench/src/tests/app_dumpurl/app_dumpurl_test.cpp
@@ -1,11 +1,11 @@
// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/vespalib/testkit/testapp.h>
#include <vbench/test/all.h>
-#include <vespa/vespalib/util/child_process.h>
+#include <vespa/vespalib/process/process.h>
#include <vespa/vespalib/net/crypto_engine.h>
using namespace vbench;
-using vespalib::ChildProcess;
+using vespalib::Process;
using InputReader = vespalib::InputReader;
using OutputWriter = vespalib::OutputWriter;
@@ -31,8 +31,8 @@ void readUntil(Input &input, SimpleBuffer &buffer, const string &end) {
}
TEST("dumpurl usage") {
- std::string out;
- EXPECT_FALSE(ChildProcess::run("../../apps/dumpurl/vbench_dumpurl_app", out));
+ vespalib::string out;
+ EXPECT_FALSE(Process::run("../../apps/dumpurl/vbench_dumpurl_app", out));
fprintf(stderr, "%s\n", out.c_str());
}
@@ -47,11 +47,11 @@ TEST_MT_F("run dumpurl", 2, ServerSocket()) {
out.write("\r\n");
out.write("data");
} else {
- std::string out;
- EXPECT_TRUE(ChildProcess::run(strfmt("../../apps/dumpurl/vbench_dumpurl_app localhost %d /foo",
- f1.port()).c_str(), out));
+ vespalib::string out;
+ EXPECT_TRUE(Process::run(strfmt("../../apps/dumpurl/vbench_dumpurl_app localhost %d /foo",
+ f1.port()).c_str(), out));
fprintf(stderr, "%s\n", out.c_str());
}
}
-TEST_MAIN_WITH_PROCESS_PROXY() { TEST_RUN_ALL(); }
+TEST_MAIN() { TEST_RUN_ALL(); }