diff options
Diffstat (limited to 'vespalib/src/tests/make_fixture_macros/make_fixture_macros_test.cpp')
-rw-r--r-- | vespalib/src/tests/make_fixture_macros/make_fixture_macros_test.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vespalib/src/tests/make_fixture_macros/make_fixture_macros_test.cpp b/vespalib/src/tests/make_fixture_macros/make_fixture_macros_test.cpp index 0264a5aad0e..1cddddf7edc 100644 --- a/vespalib/src/tests/make_fixture_macros/make_fixture_macros_test.cpp +++ b/vespalib/src/tests/make_fixture_macros/make_fixture_macros_test.cpp @@ -1,12 +1,12 @@ // Copyright Yahoo. 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/child_process.h> +#include <vespa/vespalib/process/process.h> using namespace vespalib; -bool runPrint(const char *cmd) { - std::string out; - bool res = ChildProcess::run(cmd, out); +bool runPrint(const vespalib::string &cmd) { + vespalib::string out; + bool res = Process::run(cmd, out); fprintf(stderr, "%s", out.c_str()); return res; } @@ -15,9 +15,9 @@ TEST("make fixture macros") { EXPECT_FALSE(runPrint("../../apps/make_fixture_macros/vespalib_make_fixture_macros_app")); EXPECT_TRUE(runPrint("../../apps/make_fixture_macros/vespalib_make_fixture_macros_app 9 > macros.tmp")); - std::string diffCmd("diff -u "); + vespalib::string diffCmd("diff -u "); diffCmd += TEST_PATH("../../vespa/vespalib/testkit/generated_fixture_macros.h macros.tmp"); EXPECT_TRUE(runPrint(diffCmd.c_str())); } -TEST_MAIN_WITH_PROCESS_PROXY() { TEST_RUN_ALL(); } +TEST_MAIN() { TEST_RUN_ALL(); } |