Gather 13 tests into single binary

15 files changed, 11 insertions, 140 deletions

diff --git a/searchlib/src/tests/predicate/CMakeLists.txt b/searchlib/src/tests/predicate/CMakeLists.txt
index d33e5617908..4ae06af1886 100644
--- a/searchlib/src/tests/predicate/CMakeLists.txt
+++ b/searchlib/src/tests/predicate/CMakeLists.txt
@@ -1,92 +1,21 @@
 # Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_predicate_index_test_app TEST
+vespa_add_executable(searchlib_predicate_vespa_test_app TEST
     SOURCES
+    vespa_testrunner.cpp
     predicate_index_test.cpp
-    DEPENDS
-    vespa_searchlib
-)
-vespa_add_test(NAME searchlib_predicate_index_test_app COMMAND searchlib_predicate_index_test_app)
-vespa_add_executable(searchlib_simple_index_test_app TEST
-    SOURCES
     simple_index_test.cpp
-    DEPENDS
-    vespa_searchlib
-)
-vespa_add_test(NAME searchlib_simple_index_test_app COMMAND searchlib_simple_index_test_app)
-vespa_add_executable(searchlib_tree_crumbs_test_app TEST
-    SOURCES
     tree_crumbs_test.cpp
-    DEPENDS
-    vespa_searchlib
-)
-vespa_add_test(NAME searchlib_tree_crumbs_test_app COMMAND searchlib_tree_crumbs_test_app)
-vespa_add_executable(searchlib_predicate_tree_analyzer_test_app TEST
-    SOURCES
     predicate_tree_analyzer_test.cpp
-    DEPENDS
-    vespa_searchlib
-)
-vespa_add_test(NAME searchlib_predicate_tree_analyzer_test_app COMMAND searchlib_predicate_tree_analyzer_test_app)
-vespa_add_executable(searchlib_predicate_tree_annotator_test_app TEST
-    SOURCES
     predicate_tree_annotator_test.cpp
-    DEPENDS
-    vespa_searchlib
-)
-vespa_add_test(NAME searchlib_predicate_tree_annotator_test_app COMMAND searchlib_predicate_tree_annotator_test_app)
-vespa_add_executable(searchlib_predicate_interval_store_test_app TEST
-    SOURCES
     predicate_interval_store_test.cpp
-    DEPENDS
-    vespa_searchlib
-)
-vespa_add_test(NAME searchlib_predicate_interval_store_test_app COMMAND searchlib_predicate_interval_store_test_app)
-vespa_add_executable(searchlib_document_features_store_test_app TEST
-    SOURCES
     document_features_store_test.cpp
-    DEPENDS
-    vespa_searchlib
-)
-vespa_add_test(NAME searchlib_document_features_store_test_app COMMAND searchlib_document_features_store_test_app)
-vespa_add_executable(searchlib_predicate_ref_cache_test_app TEST
-    SOURCES
     predicate_ref_cache_test.cpp
-    DEPENDS
-    vespa_searchlib
-)
-vespa_add_test(NAME searchlib_predicate_ref_cache_test_app COMMAND searchlib_predicate_ref_cache_test_app)
-vespa_add_executable(searchlib_predicate_interval_posting_list_test_app TEST
-    SOURCES
     predicate_interval_posting_list_test.cpp
-    DEPENDS
-    vespa_searchlib
-)
-vespa_add_test(NAME searchlib_predicate_interval_posting_list_test_app COMMAND searchlib_predicate_interval_posting_list_test_app)
-vespa_add_executable(searchlib_predicate_bounds_posting_list_test_app TEST
-    SOURCES
     predicate_bounds_posting_list_test.cpp
-    DEPENDS
-    vespa_searchlib
-)
-vespa_add_test(NAME searchlib_predicate_bounds_posting_list_test_app COMMAND searchlib_predicate_bounds_posting_list_test_app)
-vespa_add_executable(searchlib_predicate_zero_constraint_posting_list_test_app TEST
-    SOURCES
     predicate_zero_constraint_posting_list_test.cpp
-    DEPENDS
-    vespa_searchlib
-)
-vespa_add_test(NAME searchlib_predicate_zero_constraint_posting_list_test_app COMMAND searchlib_predicate_zero_constraint_posting_list_test_app)
-vespa_add_executable(searchlib_predicate_zstar_compressed_posting_list_test_app TEST
-    SOURCES
     predicate_zstar_compressed_posting_list_test.cpp
-    DEPENDS
-    vespa_searchlib
-)
-vespa_add_test(NAME searchlib_predicate_zstar_compressed_posting_list_test_app COMMAND searchlib_predicate_zstar_compressed_posting_list_test_app)
-vespa_add_executable(searchlib_predicate_range_term_expander_test_app TEST
-    SOURCES
     predicate_range_term_expander_test.cpp
     DEPENDS
     vespa_searchlib
 )
-vespa_add_test(NAME searchlib_predicate_range_term_expander_test_app COMMAND searchlib_predicate_range_term_expander_test_app)
+vespa_add_test(NAME searchlib_predicate_vespa_test_app COMMAND searchlib_predicate_vespa_test_app)
diff --git a/searchlib/src/tests/predicate/document_features_store_test.cpp b/searchlib/src/tests/predicate/document_features_store_test.cpp
index cc090a953b5..01eaa75a71a 100644
--- a/searchlib/src/tests/predicate/document_features_store_test.cpp
+++ b/searchlib/src/tests/predicate/document_features_store_test.cpp
@@ -8,10 +8,6 @@
 #include <vespa/searchlib/predicate/predicate_tree_annotator.h>
 #include <vespa/searchlib/predicate/predicate_hash.h>
 #include <vespa/vespalib/testkit/test_kit.h>
-#include <string>
-
-#include <vespa/log/log.h>
-LOG_SETUP("document_features_store_test");
 
 using namespace search;
 using namespace search::predicate;
@@ -233,5 +229,3 @@ TEST("require that serialization cleans up wordstore") {
 
 
 }  // namespace
-
-TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/searchlib/src/tests/predicate/predicate_bounds_posting_list_test.cpp b/searchlib/src/tests/predicate/predicate_bounds_posting_list_test.cpp
index 91e9fc0f9a4..be7f4516bb2 100644
--- a/searchlib/src/tests/predicate/predicate_bounds_posting_list_test.cpp
+++ b/searchlib/src/tests/predicate/predicate_bounds_posting_list_test.cpp
@@ -9,9 +9,6 @@
 #include <vespa/vespalib/btree/btreestore.hpp>
 #include <vespa/vespalib/testkit/test_kit.h>
 
-#include <vespa/log/log.h>
-LOG_SETUP("predicate_bounds_posting_list_test");
-
 using namespace search;
 using namespace search::predicate;
 
@@ -106,5 +103,3 @@ TEST("require that bounds posting list checks bounds.") {
 }
 
 }  // namespace
-
-TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/searchlib/src/tests/predicate/predicate_index_test.cpp b/searchlib/src/tests/predicate/predicate_index_test.cpp
index 120862a1477..d0af12f93c7 100644
--- a/searchlib/src/tests/predicate/predicate_index_test.cpp
+++ b/searchlib/src/tests/predicate/predicate_index_test.cpp
@@ -12,9 +12,6 @@
 #include <vespa/vespalib/btree/btreeiterator.hpp>
 #include <vespa/vespalib/btree/btreestore.hpp>
 
-#include <vespa/log/log.h>
-LOG_SETUP("predicate_index_test");
-
 using namespace search;
 using namespace search::predicate;
 using std::make_pair;
@@ -454,5 +451,3 @@ TEST("require that predicate index saver protected by a generation guard observe
 }
 
 }  // namespace
-
-TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/searchlib/src/tests/predicate/predicate_interval_posting_list_test.cpp b/searchlib/src/tests/predicate/predicate_interval_posting_list_test.cpp
index 3977933dbc3..098c0238412 100644
--- a/searchlib/src/tests/predicate/predicate_interval_posting_list_test.cpp
+++ b/searchlib/src/tests/predicate/predicate_interval_posting_list_test.cpp
@@ -9,9 +9,6 @@
 #include <vespa/vespalib/btree/btreestore.hpp>
 #include <vespa/vespalib/testkit/test_kit.h>
 
-#include <vespa/log/log.h>
-LOG_SETUP("predicate_interval_posting_list_test");
-
 using namespace search;
 using namespace search::predicate;
 namespace {
@@ -79,5 +76,3 @@ TEST("require that posting list can iterate.") {
 }
 
 }  // namespace
-
-TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/searchlib/src/tests/predicate/predicate_interval_store_test.cpp b/searchlib/src/tests/predicate/predicate_interval_store_test.cpp
index 9c2847bc8cf..d8c9691d421 100644
--- a/searchlib/src/tests/predicate/predicate_interval_store_test.cpp
+++ b/searchlib/src/tests/predicate/predicate_interval_store_test.cpp
@@ -1,9 +1,6 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // Unit tests for predicate_interval_store.
 
-#include <vespa/log/log.h>
-LOG_SETUP("predicate_interval_store_test");
-
 #include <vespa/searchlib/predicate/predicate_interval_store.h>
 
 #include <vespa/searchlib/predicate/predicate_index.h>
@@ -147,5 +144,3 @@ TEST("require that interval refs are reused for identical data.") {
 }
 
 }  // namespace
-
-TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/searchlib/src/tests/predicate/predicate_range_term_expander_test.cpp b/searchlib/src/tests/predicate/predicate_range_term_expander_test.cpp
index bec1cd9f24a..2dce3c50b0a 100644
--- a/searchlib/src/tests/predicate/predicate_range_term_expander_test.cpp
+++ b/searchlib/src/tests/predicate/predicate_range_term_expander_test.cpp
@@ -1,9 +1,6 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // Unit tests for predicate_range_term_expander.
 
-#include <vespa/log/log.h>
-LOG_SETUP("predicate_range_term_expander_test");
-
 #include <vespa/searchlib/predicate/predicate_range_term_expander.h>
 #include <vespa/vespalib/btree/btreestore.hpp>
 #include <vespa/vespalib/testkit/test_kit.h>
@@ -328,5 +325,3 @@ TEST("require that search close to max uneven upper bound is sensible") {
 }
 
 }  // namespace
-
-TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/searchlib/src/tests/predicate/predicate_ref_cache_test.cpp b/searchlib/src/tests/predicate/predicate_ref_cache_test.cpp
index 692482b8933..f62f3f807c5 100644
--- a/searchlib/src/tests/predicate/predicate_ref_cache_test.cpp
+++ b/searchlib/src/tests/predicate/predicate_ref_cache_test.cpp
@@ -1,9 +1,6 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // Unit tests for predicate_ref_cache.
 
-#include <vespa/log/log.h>
-LOG_SETUP("predicate_ref_cache_test");
-
 #include <vespa/searchlib/predicate/predicate_ref_cache.h>
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vector>
@@ -101,5 +98,3 @@ TEST("require that cache handles large entries") {
 }
 
 }  // namespace
-
-TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/searchlib/src/tests/predicate/predicate_tree_analyzer_test.cpp b/searchlib/src/tests/predicate/predicate_tree_analyzer_test.cpp
index 854abcd6fda..73a236aa443 100644
--- a/searchlib/src/tests/predicate/predicate_tree_analyzer_test.cpp
+++ b/searchlib/src/tests/predicate/predicate_tree_analyzer_test.cpp
@@ -1,9 +1,6 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // Unit tests for PredicateTreeAnalyzer.
 
-#include <vespa/log/log.h>
-LOG_SETUP("PredicateTreeAnalyzer_test");
-
 #include <vespa/document/predicate/predicate.h>
 #include <vespa/document/predicate/predicate_slime_builder.h>
 #include <vespa/searchlib/predicate/predicate_tree_analyzer.h>
@@ -152,5 +149,3 @@ TEST("require that multilevel AND stores sizes") {
 }
 
 }  // namespace
-
-TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/searchlib/src/tests/predicate/predicate_tree_annotator_test.cpp b/searchlib/src/tests/predicate/predicate_tree_annotator_test.cpp
index fa586153f19..4d71f585910 100644
--- a/searchlib/src/tests/predicate/predicate_tree_annotator_test.cpp
+++ b/searchlib/src/tests/predicate/predicate_tree_annotator_test.cpp
@@ -10,9 +10,6 @@
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <sstream>
 
-#include <vespa/log/log.h>
-LOG_SETUP("PredicateTreeAnnotator_test");
-
 using document::Predicate;
 using std::ostringstream;
 using std::pair;
@@ -403,5 +400,3 @@ TEST("require that open range works") {
 }
 
 }  // namespace
-
-TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/searchlib/src/tests/predicate/predicate_zero_constraint_posting_list_test.cpp b/searchlib/src/tests/predicate/predicate_zero_constraint_posting_list_test.cpp
index 83d29102a7b..5907dce72ba 100644
--- a/searchlib/src/tests/predicate/predicate_zero_constraint_posting_list_test.cpp
+++ b/searchlib/src/tests/predicate/predicate_zero_constraint_posting_list_test.cpp
@@ -6,9 +6,6 @@
 
 #include <vespa/vespalib/testkit/test_kit.h>
 
-#include <vespa/log/log.h>
-LOG_SETUP("predicate_zero_constraint_posting_list_test");
-
 using namespace search;
 using namespace search::predicate;
 
@@ -54,5 +51,3 @@ TEST("require that posting list can iterate.") {
 }
 
 }  // namespace
-
-TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/searchlib/src/tests/predicate/predicate_zstar_compressed_posting_list_test.cpp b/searchlib/src/tests/predicate/predicate_zstar_compressed_posting_list_test.cpp
index a7011ec51d2..20cd0809473 100644
--- a/searchlib/src/tests/predicate/predicate_zstar_compressed_posting_list_test.cpp
+++ b/searchlib/src/tests/predicate/predicate_zstar_compressed_posting_list_test.cpp
@@ -8,9 +8,6 @@
 #include <vespa/vespalib/btree/btreestore.hpp>
 #include <vespa/vespalib/testkit/test_kit.h>
 
-#include <vespa/log/log.h>
-LOG_SETUP("predicate_zstar_compressed_posting_list_test");
-
 using namespace search;
 using namespace search::predicate;
 using std::vector;
@@ -93,5 +90,3 @@ TEST("require that posting list can iterate.") {
 }
 
 }  // namespace
-
-TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/searchlib/src/tests/predicate/simple_index_test.cpp b/searchlib/src/tests/predicate/simple_index_test.cpp
index a9e5e7c9065..964ff67bd3a 100644
--- a/searchlib/src/tests/predicate/simple_index_test.cpp
+++ b/searchlib/src/tests/predicate/simple_index_test.cpp
@@ -16,9 +16,6 @@
 #include <vespa/vespalib/util/rcuvector.hpp>
 #include <map>
 
-#include <vespa/log/log.h>
-LOG_SETUP("simple_index_test");
-
 using namespace search;
 using namespace search::predicate;
 using vespalib::GenerationHolder;
@@ -342,5 +339,3 @@ TEST_F("require that vector contains correct postings", Fixture) {
 }
 
 }  // namespace
-
-TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/searchlib/src/tests/predicate/tree_crumbs_test.cpp b/searchlib/src/tests/predicate/tree_crumbs_test.cpp
index 5c5775e5a5b..76bfd02ee50 100644
--- a/searchlib/src/tests/predicate/tree_crumbs_test.cpp
+++ b/searchlib/src/tests/predicate/tree_crumbs_test.cpp
@@ -1,9 +1,6 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // Unit tests for TreeCrumbs.
 
-#include <vespa/log/log.h>
-LOG_SETUP("TreeCrumbs_test");
-
 #include <vespa/searchlib/predicate/tree_crumbs.h>
 #include <vespa/vespalib/testkit/test_kit.h>
 
@@ -60,5 +57,3 @@ TEST("require that crumbs can set custom initial char") {
 }
 
 }  // namespace
-
-TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/searchlib/src/tests/predicate/vespa_testrunner.cpp b/searchlib/src/tests/predicate/vespa_testrunner.cpp
new file mode 100644
index 00000000000..d812605710e
--- /dev/null
+++ b/searchlib/src/tests/predicate/vespa_testrunner.cpp
@@ -0,0 +1,8 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Unit tests for predicate_index.
+#include <vespa/vespalib/testkit/test_kit.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP("predicate_test");
+
+TEST_MAIN() { TEST_RUN_ALL(); }