diff options
Diffstat (limited to 'eval/src/tests/apps')
| -rw-r--r-- | eval/src/tests/apps/analyze_onnx_model/analyze_onnx_model_test.cpp | 12 | ||||
| -rw-r--r-- | eval/src/tests/apps/eval_expr/eval_expr_test.cpp | 3 |
2 files changed, 7 insertions, 8 deletions
diff --git a/eval/src/tests/apps/analyze_onnx_model/analyze_onnx_model_test.cpp b/eval/src/tests/apps/analyze_onnx_model/analyze_onnx_model_test.cpp index 72ef0346ea3..68d9ed69f80 100644 --- a/eval/src/tests/apps/analyze_onnx_model/analyze_onnx_model_test.cpp +++ b/eval/src/tests/apps/analyze_onnx_model/analyze_onnx_model_test.cpp @@ -39,13 +39,13 @@ TEST_F("require that output types can be probed", ServerCmd(probe_cmd)) { //----------------------------------------------------------------------------- -TEST_F("test error: invalid json", ServerCmd(probe_cmd, ServerCmd::capture_stderr_tag())) { +TEST_F("test error: invalid json", ServerCmd(probe_cmd)) { auto out = f1.write_then_read_all("this is not valid json...\n"); EXPECT_TRUE(out.find("invalid json") < out.size()); EXPECT_EQUAL(f1.shutdown(), 3); } -TEST_F("test error: missing input type", ServerCmd(probe_cmd, ServerCmd::capture_stderr_tag())) { +TEST_F("test error: missing input type", ServerCmd(probe_cmd)) { Slime params; params.setObject(); params.get().setString("model", simple_model); @@ -55,7 +55,7 @@ TEST_F("test error: missing input type", ServerCmd(probe_cmd, ServerCmd::capture EXPECT_EQUAL(f1.shutdown(), 3); } -TEST_F("test error: invalid input type", ServerCmd(probe_cmd, ServerCmd::capture_stderr_tag())) { +TEST_F("test error: invalid input type", ServerCmd(probe_cmd)) { Slime params; params.setObject(); params.get().setString("model", simple_model); @@ -68,7 +68,7 @@ TEST_F("test error: invalid input type", ServerCmd(probe_cmd, ServerCmd::capture EXPECT_EQUAL(f1.shutdown(), 3); } -TEST_F("test error: incompatible input type", ServerCmd(probe_cmd, ServerCmd::capture_stderr_tag())) { +TEST_F("test error: incompatible input type", ServerCmd(probe_cmd)) { Slime params; params.setObject(); params.get().setString("model", simple_model); @@ -81,7 +81,7 @@ TEST_F("test error: incompatible input type", ServerCmd(probe_cmd, ServerCmd::ca EXPECT_EQUAL(f1.shutdown(), 3); } -TEST_F("test error: symbolic size mismatch", ServerCmd(probe_cmd, ServerCmd::capture_stderr_tag())) { +TEST_F("test error: symbolic size mismatch", ServerCmd(probe_cmd)) { Slime params; params.setObject(); params.get().setString("model", dynamic_model); @@ -97,4 +97,4 @@ TEST_F("test error: symbolic size mismatch", ServerCmd(probe_cmd, ServerCmd::cap //----------------------------------------------------------------------------- -TEST_MAIN_WITH_PROCESS_PROXY() { TEST_RUN_ALL(); } +TEST_MAIN() { TEST_RUN_ALL(); } diff --git a/eval/src/tests/apps/eval_expr/eval_expr_test.cpp b/eval/src/tests/apps/eval_expr/eval_expr_test.cpp index fd103829618..d7979c6dbea 100644 --- a/eval/src/tests/apps/eval_expr/eval_expr_test.cpp +++ b/eval/src/tests/apps/eval_expr/eval_expr_test.cpp @@ -4,7 +4,6 @@ #include <vespa/vespalib/testkit/time_bomb.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/data/slime/slime.h> -#include <vespa/vespalib/util/child_process.h> #include <vespa/vespalib/data/input.h> #include <vespa/vespalib/data/output.h> #include <vespa/vespalib/data/simple_buffer.h> @@ -168,4 +167,4 @@ TEST_F("require that type issues produces error", Server()) { //----------------------------------------------------------------------------- -TEST_MAIN_WITH_PROCESS_PROXY() { TEST_RUN_ALL(); } +TEST_MAIN() { TEST_RUN_ALL(); } |