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 /searchcore/src/tests/proton/verify_ranksetup | |
| parent | ed8fa0954399f92b38d6332ca48b24105e83b833 (diff) | |
rename SlaveProc -> ChildProc
Diffstat (limited to 'searchcore/src/tests/proton/verify_ranksetup')
| -rw-r--r-- | searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp b/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp index fd7069c618a..6569575e856 100644 --- a/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp +++ b/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp @@ -1,6 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/util/slaveproc.h> +#include <vespa/vespalib/util/child_proc.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/searchcommon/common/schema.h> #include <vespa/searchlib/fef/indexproperties.h> @@ -154,7 +154,7 @@ struct Model { } bool verify() { generate(); - return vespalib::SlaveProc::run(vespalib::make_string("%s dir:%s", prog, gen_dir.c_str()).c_str()); + return vespalib::ChildProc::run(vespalib::make_string("%s dir:%s", prog, gen_dir.c_str()).c_str()); } void verify_valid(std::initializer_list<std::string> features) { for (const std::string &f: features) { @@ -207,12 +207,12 @@ struct ShadowModel : Model { }; TEST_F("print usage", Model()) { - EXPECT_TRUE(!vespalib::SlaveProc::run(vespalib::make_string("%s", prog).c_str())); + EXPECT_TRUE(!vespalib::ChildProc::run(vespalib::make_string("%s", prog).c_str())); } TEST_F("setup output directory", Model()) { - ASSERT_TRUE(vespalib::SlaveProc::run(vespalib::make_string("rm -rf %s", gen_dir.c_str()).c_str())); - ASSERT_TRUE(vespalib::SlaveProc::run(vespalib::make_string("mkdir %s", gen_dir.c_str()).c_str())); + ASSERT_TRUE(vespalib::ChildProc::run(vespalib::make_string("rm -rf %s", gen_dir.c_str()).c_str())); + ASSERT_TRUE(vespalib::ChildProc::run(vespalib::make_string("mkdir %s", gen_dir.c_str()).c_str())); } //----------------------------------------------------------------------------- @@ -317,7 +317,7 @@ TEST_F("require that imported attribute field can be used by rank feature", Simp //----------------------------------------------------------------------------- TEST_F("cleanup files", Model()) { - ASSERT_TRUE(vespalib::SlaveProc::run(vespalib::make_string("rm -rf %s", gen_dir.c_str()).c_str())); + ASSERT_TRUE(vespalib::ChildProc::run(vespalib::make_string("rm -rf %s", gen_dir.c_str()).c_str())); } TEST_MAIN_WITH_PROCESS_PROXY() { TEST_RUN_ALL(); } |