3 files changed, 5 insertions, 26 deletions
diff --git a/eval/src/apps/tensor_conformance/generate.cpp b/eval/src/apps/tensor_conformance/generate.cpp
index 4d757f6ebbc..8a596ad38d4 100644
--- a/eval/src/apps/tensor_conformance/generate.cpp
+++ b/eval/src/apps/tensor_conformance/generate.cpp
@@ -14,19 +14,6 @@ using vespalib::make_string_short::fmt;
 
 namespace {
 
-struct IgnoreJava : TestBuilder {
-    TestBuilder &dst;
-    IgnoreJava(TestBuilder &dst_in) : TestBuilder(dst_in.full), dst(dst_in) {}
-    void add(const vespalib::string &expression,
-             const std::map<vespalib::string,TensorSpec> &inputs,
-             const std::set<vespalib::string> &ignore) override
-    {
-        auto my_ignore = ignore;
-        my_ignore.insert("vespajlib");
-        dst.add(expression, inputs, my_ignore);
-    }
-};
-
 //-----------------------------------------------------------------------------
 
 const std::vector<vespalib::string> basic_layouts = {
@@ -286,8 +273,6 @@ void generate_join(TestBuilder &dst) {
     generate_op2_join("min(a,b)", Div16(N()), dst);
     generate_op2_join("max(a,b)", Div16(N()), dst);
     generate_op2_join("bit(a,b)", Seq({-128, -43, -1, 0, 85, 127}), Seq({0, 1, 2, 3, 4, 5, 6, 7}), dst);
-    IgnoreJava ignore_java(dst);
-    generate_op2_join("hamming(a,b)", Seq({-128, -43, -1, 0, 85, 127}), ignore_java); // TODO: require java
     // inverted lambda
     generate_join_expr("join(a,b,f(a,b)(b-a))", Div16(N()), dst);
     // custom lambda
@@ -346,8 +331,6 @@ void generate_merge(TestBuilder &dst) {
     generate_op2_merge("min(a,b)", Div16(N()), dst);
     generate_op2_merge("max(a,b)", Div16(N()), dst);
     generate_op2_merge("bit(a,b)", Seq({-128, -43, -1, 0, 85, 127}), Seq({0, 1, 2, 3, 4, 5, 6, 7}), dst);
-    IgnoreJava ignore_java(dst);
-    generate_op2_merge("hamming(a,b)", Seq({-128, -43, -1, 0, 85, 127}), ignore_java); // TODO: require java
     // inverted lambda
     generate_merge_expr("merge(a,b,f(a,b)(b-a))", Div16(N()), dst);
     // custom lambda
diff --git a/eval/src/apps/tensor_conformance/generate.h b/eval/src/apps/tensor_conformance/generate.h
index 9aa90ae9a7a..e9482b9015c 100644
--- a/eval/src/apps/tensor_conformance/generate.h
+++ b/eval/src/apps/tensor_conformance/generate.h
@@ -18,6 +18,11 @@ struct TestBuilder {
     {
         add(expression, inputs, {});
     }
+    void add_ignore_java(const vespalib::string &expression,
+                         const std::map<vespalib::string,TensorSpec> &inputs)
+    {
+        add(expression, inputs, {"vespajlib"});
+    }
     virtual ~TestBuilder() {}
 };
 
diff --git a/eval/src/apps/tensor_conformance/tensor_conformance.cpp b/eval/src/apps/tensor_conformance/tensor_conformance.cpp
index 6c28b1e652e..e6bbb1f8a41 100644
--- a/eval/src/apps/tensor_conformance/tensor_conformance.cpp
+++ b/eval/src/apps/tensor_conformance/tensor_conformance.cpp
@@ -167,15 +167,6 @@ void print_test(const Inspector &test, OutputWriter &dst) {
     }
     auto result = eval_expr(test, prod_factory);
     dst.printf("result: %s\n", result.to_string().c_str());
-    auto ignore = extract_fields(test["ignore"]);
-    if (!ignore.empty()) {
-        dst.printf("ignore:");
-        for (const auto &impl: ignore) {
-            REQUIRE(test["ignore"][impl].asBool());
-            dst.printf(" %s", impl.c_str());
-        }
-        dst.printf("\n");
-    }
 }
 
 //-----------------------------------------------------------------------------