gc old process code

also added read_line function to new Process code

1 files changed, 9 insertions, 12 deletions

diff --git a/vespalib/src/tests/drop-file-from-cache/drop_file_from_cache_test.cpp b/vespalib/src/tests/drop-file-from-cache/drop_file_from_cache_test.cpp
index e3344fb4106..63cec1caee1 100644
--- a/vespalib/src/tests/drop-file-from-cache/drop_file_from_cache_test.cpp
+++ b/vespalib/src/tests/drop-file-from-cache/drop_file_from_cache_test.cpp
@@ -1,25 +1,22 @@
 // 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 vespalib::ChildProcess;
+using vespalib::Process;
 
 TEST("no arguments") {
-    ChildProcess drop("../../apps/vespa-drop-file-from-cache/vespa-drop-file-from-cache");
-    drop.wait();
-    EXPECT_EQUAL(1, drop.getExitCode());
+    Process drop("../../apps/vespa-drop-file-from-cache/vespa-drop-file-from-cache");
+    EXPECT_EQUAL(1, drop.join());
 }
 
 TEST("file does not exist") {
-    ChildProcess drop("../../apps/vespa-drop-file-from-cache/vespa-drop-file-from-cache not_exist");
-    drop.wait();
-    EXPECT_EQUAL(2, drop.getExitCode());
+    Process drop("../../apps/vespa-drop-file-from-cache/vespa-drop-file-from-cache not_exist");
+    EXPECT_EQUAL(2, drop.join());
 }
 
 TEST("All is well") {
-    ChildProcess drop("../../apps/vespa-drop-file-from-cache/vespa-drop-file-from-cache vespalib_drop_file_from_cache_test_app");
-    drop.wait();
-    EXPECT_EQUAL(0, drop.getExitCode());
+    Process drop("../../apps/vespa-drop-file-from-cache/vespa-drop-file-from-cache vespalib_drop_file_from_cache_test_app");
+    EXPECT_EQUAL(0, drop.join());
 }
 
-TEST_MAIN_WITH_PROCESS_PROXY() { TEST_RUN_ALL(); }
+TEST_MAIN() { TEST_RUN_ALL(); }