diff options
author | Arne Juul <arnej@verizonmedia.com> | 2020-07-15 18:06:37 +0000 |
---|---|---|
committer | Arne Juul <arnej@verizonmedia.com> | 2020-07-17 14:38:14 +0000 |
commit | 6f26d4daad46da0aa3ccae312da522d203a21585 (patch) | |
tree | d0bb08ec17ed6e37e0b8673fbbe11b53c65f6194 /vbench/src/tests | |
parent | ed8fa0954399f92b38d6332ca48b24105e83b833 (diff) |
rename SlaveProc -> ChildProc
Diffstat (limited to 'vbench/src/tests')
-rw-r--r-- | vbench/src/tests/app_dumpurl/app_dumpurl_test.cpp | 8 | ||||
-rw-r--r-- | vbench/src/tests/app_vbench/app_vbench_test.cpp | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/vbench/src/tests/app_dumpurl/app_dumpurl_test.cpp b/vbench/src/tests/app_dumpurl/app_dumpurl_test.cpp index 0b4a83bf714..e59803c71c8 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 2017 Yahoo Holdings. 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/slaveproc.h> +#include <vespa/vespalib/util/child_proc.h> #include <vespa/vespalib/net/crypto_engine.h> using namespace vbench; -using vespalib::SlaveProc; +using vespalib::ChildProc; using InputReader = vespalib::InputReader; using OutputWriter = vespalib::OutputWriter; @@ -32,7 +32,7 @@ void readUntil(Input &input, SimpleBuffer &buffer, const string &end) { TEST("dumpurl usage") { std::string out; - EXPECT_FALSE(SlaveProc::run("../../apps/dumpurl/vbench_dumpurl_app", out)); + EXPECT_FALSE(ChildProc::run("../../apps/dumpurl/vbench_dumpurl_app", out)); fprintf(stderr, "%s\n", out.c_str()); } @@ -48,7 +48,7 @@ TEST_MT_F("run dumpurl", 2, ServerSocket()) { out.write("data"); } else { std::string out; - EXPECT_TRUE(SlaveProc::run(strfmt("../../apps/dumpurl/vbench_dumpurl_app localhost %d /foo", + EXPECT_TRUE(ChildProc::run(strfmt("../../apps/dumpurl/vbench_dumpurl_app localhost %d /foo", f1.port()).c_str(), out)); fprintf(stderr, "%s\n", out.c_str()); } diff --git a/vbench/src/tests/app_vbench/app_vbench_test.cpp b/vbench/src/tests/app_vbench/app_vbench_test.cpp index 8b5bb71425d..37f549ece22 100644 --- a/vbench/src/tests/app_vbench/app_vbench_test.cpp +++ b/vbench/src/tests/app_vbench/app_vbench_test.cpp @@ -1,7 +1,7 @@ // Copyright 2017 Yahoo Holdings. 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/slaveproc.h> +#include <vespa/vespalib/util/child_proc.h> #include <vespa/vespalib/net/crypto_engine.h> #include <vespa/vespalib/net/tls/tls_crypto_engine.h> #include <vespa/vespalib/test/make_tls_options_for_testing.h> @@ -11,7 +11,7 @@ #include <fcntl.h> using namespace vbench; -using vespalib::SlaveProc; +using vespalib::ChildProc; using InputReader = vespalib::InputReader; using OutputWriter = vespalib::OutputWriter; @@ -32,7 +32,7 @@ void write_file(const vespalib::string &file_name, const vespalib::string &conte TEST("vbench usage") { std::string out; - EXPECT_FALSE(SlaveProc::run("../../apps/vbench/vbench_app", out)); + EXPECT_FALSE(ChildProc::run("../../apps/vbench/vbench_app", out)); fprintf(stderr, "%s\n", out.c_str()); } @@ -69,14 +69,14 @@ struct Servers { TEST_MT_F("run vbench", 2, Servers()) { if (thread_id == 0) { std::string out; - EXPECT_TRUE(SlaveProc::run(strfmt("sed 's/_LOCAL_PORT_/%d/' vbench.cfg.template > vbench.cfg", f1.portal->listen_port()).c_str())); - EXPECT_TRUE(SlaveProc::run("../../apps/vbench/vbench_app run vbench.cfg 2> vbench.out", out)); + EXPECT_TRUE(ChildProc::run(strfmt("sed 's/_LOCAL_PORT_/%d/' vbench.cfg.template > vbench.cfg", f1.portal->listen_port()).c_str())); + EXPECT_TRUE(ChildProc::run("../../apps/vbench/vbench_app run vbench.cfg 2> vbench.out", out)); fprintf(stderr, "null crypto: %s\n", out.c_str()); EXPECT_GREATER(f1.my_get.cnt, 10u); } else { std::string tls_out; - EXPECT_TRUE(SlaveProc::run(strfmt("sed 's/_LOCAL_PORT_/%d/' vbench.tls.cfg.template > vbench.tls.cfg", f1.tls_portal->listen_port()).c_str())); - EXPECT_TRUE(SlaveProc::run("../../apps/vbench/vbench_app run vbench.tls.cfg 2> vbench.tls.out", tls_out)); + EXPECT_TRUE(ChildProc::run(strfmt("sed 's/_LOCAL_PORT_/%d/' vbench.tls.cfg.template > vbench.tls.cfg", f1.tls_portal->listen_port()).c_str())); + EXPECT_TRUE(ChildProc::run("../../apps/vbench/vbench_app run vbench.tls.cfg 2> vbench.tls.out", tls_out)); fprintf(stderr, "tls crypto: %s\n", tls_out.c_str()); EXPECT_GREATER(f1.my_tls_get.cnt, 10u); } |