aboutsummaryrefslogtreecommitdiffstats
path: root/searchlib/src
diff options
context:
space:
mode:
authorVegard Sjonfjell <vegard@yahoo-inc.com>2016-06-16 14:20:40 +0200
committerVegard Sjonfjell <vegard@yahoo-inc.com>2016-06-16 14:20:40 +0200
commit9ffb5969ff851b6661d966b182ab4cdc90bb7100 (patch)
tree70991e9edd4b6010f95cb2a0f20b39ad84395bb6 /searchlib/src
parent63f4017a6f42955a182f0a1a33cfe6449b090704 (diff)
Declared test executables as tests with TEST parameter
Diffstat (limited to 'searchlib/src')
-rw-r--r--searchlib/src/tests/aggregator/CMakeLists.txt4
-rw-r--r--searchlib/src/tests/alignment/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/attribute/CMakeLists.txt6
-rw-r--r--searchlib/src/tests/attribute/attributefilewriter/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/attribute/attributemanager/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/attribute/bitvector/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/attribute/comparator/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/attribute/document_weight_iterator/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/attribute/enumeratedsave/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/attribute/enumstore/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/attribute/extendattributes/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/attribute/multivaluemapping/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/attribute/postinglist/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/attribute/postinglistattribute/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/attribute/searchable/CMakeLists.txt6
-rw-r--r--searchlib/src/tests/attribute/searchcontext/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/attribute/sourceselector/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/attribute/stringattribute/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/attribute/tensorattribute/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/bitcompression/expgolomb/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/btree/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/bytecomplens/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/common/bitvector/CMakeLists.txt4
-rw-r--r--searchlib/src/tests/common/foregroundtaskexecutor/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/common/location/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/common/packets/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/common/rcuvector/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/common/resultset/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/common/sequencedtaskexecutor/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/common/summaryfeatures/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/datastore/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/diskindex/bitvector/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/diskindex/diskindex/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/diskindex/fusion/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/diskindex/pagedict4/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/document_store/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/document_store/visitor/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/engine/docsumapi/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/engine/monitorapi/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/engine/searchapi/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/engine/transportserver/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/features/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/features/beta/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/features/element_completeness/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/features/element_similarity_feature/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/features/euclidean_distance/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/features/item_raw_score/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/features/native_dot_product/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/features/ranking_expression/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/features/raw_score/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/features/subqueries/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/features/tensor/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/features/tensor_from_labels/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/features/tensor_from_weighted_set/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/features/text_similarity_feature/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/features/util/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/fef/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/fef/attributecontent/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/fef/featurenamebuilder/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/fef/featurenameparser/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/fef/featureoverride/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/fef/object_passing/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/fef/parameter/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/fef/phrasesplitter/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/fef/properties/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/fef/rank_program/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/fef/resolver/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/fef/table/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/fef/termfieldmodel/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/fef/termmatchdatamerger/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/fileheaderinspect/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/fileheadertk/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/forcelink/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/grouping/CMakeLists.txt8
-rw-r--r--searchlib/src/tests/hitcollector/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/index/docbuilder/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/index/doctypebuilder/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/indexmetainfo/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/ld-library-path/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/memoryindex/btree/CMakeLists.txt4
-rw-r--r--searchlib/src/tests/memoryindex/compact_document_words_store/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/memoryindex/datastore/CMakeLists.txt6
-rw-r--r--searchlib/src/tests/memoryindex/dictionary/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/memoryindex/document_remover/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/memoryindex/documentinverter/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/memoryindex/fieldinverter/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/memoryindex/memoryindex/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/memoryindex/urlfieldinverter/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/memorytub/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/nativerank/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/nearsearch/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/postinglistbm/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/predicate/CMakeLists.txt26
-rw-r--r--searchlib/src/tests/prettyfloat/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/query/CMakeLists.txt14
-rw-r--r--searchlib/src/tests/queryeval/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/queryeval/blueprint/CMakeLists.txt6
-rw-r--r--searchlib/src/tests/queryeval/booleanmatchiteratorwrapper/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/queryeval/dot_product/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/queryeval/equiv/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/queryeval/fake_searchable/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/queryeval/getnodeweight/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/queryeval/monitoring_search_iterator/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/queryeval/multibitvectoriterator/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/queryeval/parallel_weak_and/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/queryeval/predicate/CMakeLists.txt4
-rw-r--r--searchlib/src/tests/queryeval/simple_phrase/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/queryeval/sourceblender/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/queryeval/termwise_eval/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/queryeval/weak_and/CMakeLists.txt4
-rw-r--r--searchlib/src/tests/queryeval/weak_and_heap/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/queryeval/weak_and_scorers/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/queryeval/weighted_set_term/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/rankingexpression/feature_name_extractor/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/ranksetup/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/ranksetup/verify_feature/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/sortresults/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/sortspec/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/stackdumpiterator/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/stringenum/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/transactionlog/CMakeLists.txt4
-rw-r--r--searchlib/src/tests/true/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/url/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/util/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/util/bufferwriter/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/util/ioerrorhandler/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/util/searchable_stats/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/util/sigbushandler/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/util/slime_output_raw_buf_adapter/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/util/statebuf/CMakeLists.txt2
-rw-r--r--searchlib/src/tests/util/statefile/CMakeLists.txt2
132 files changed, 167 insertions, 167 deletions
diff --git a/searchlib/src/tests/aggregator/CMakeLists.txt b/searchlib/src/tests/aggregator/CMakeLists.txt
index 1cc750a8fac..df3be797204 100644
--- a/searchlib/src/tests/aggregator/CMakeLists.txt
+++ b/searchlib/src/tests/aggregator/CMakeLists.txt
@@ -1,12 +1,12 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_perdocexpr_test_app
+vespa_add_executable(searchlib_perdocexpr_test_app TEST
SOURCES
perdocexpr.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_perdocexpr_test_app COMMAND searchlib_perdocexpr_test_app)
-vespa_add_executable(searchlib_attr_test_app
+vespa_add_executable(searchlib_attr_test_app TEST
SOURCES
attr_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/alignment/CMakeLists.txt b/searchlib/src/tests/alignment/CMakeLists.txt
index 3695c600f9b..5aa724890fa 100644
--- a/searchlib/src/tests/alignment/CMakeLists.txt
+++ b/searchlib/src/tests/alignment/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_alignment_test_app
+vespa_add_executable(searchlib_alignment_test_app TEST
SOURCES
alignment.cpp
DEPENDS
diff --git a/searchlib/src/tests/attribute/CMakeLists.txt b/searchlib/src/tests/attribute/CMakeLists.txt
index 0598b5776a8..b746dfc521d 100644
--- a/searchlib/src/tests/attribute/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/CMakeLists.txt
@@ -1,19 +1,19 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_attributeguard_test_app
+vespa_add_executable(searchlib_attributeguard_test_app TEST
SOURCES
attributeguard.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_attributeguard_test_app COMMAND sh attributeguard_test.sh)
-vespa_add_executable(searchlib_attribute_test_app
+vespa_add_executable(searchlib_attribute_test_app TEST
SOURCES
attribute_test.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_attribute_test_app COMMAND sh attribute_test.sh)
-vespa_add_executable(searchlib_changevector_test_app
+vespa_add_executable(searchlib_changevector_test_app TEST
SOURCES
changevector_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/attribute/attributefilewriter/CMakeLists.txt b/searchlib/src/tests/attribute/attributefilewriter/CMakeLists.txt
index a1d859bbfb9..e5fcb9f4504 100644
--- a/searchlib/src/tests/attribute/attributefilewriter/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/attributefilewriter/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_attributefilewriter_test_app
+vespa_add_executable(searchlib_attributefilewriter_test_app TEST
SOURCES
attributefilewriter_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/attribute/attributemanager/CMakeLists.txt b/searchlib/src/tests/attribute/attributemanager/CMakeLists.txt
index ed3eeee1065..cb828cd6ab5 100644
--- a/searchlib/src/tests/attribute/attributemanager/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/attributemanager/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_attributemanager_test_app
+vespa_add_executable(searchlib_attributemanager_test_app TEST
SOURCES
attributemanager_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/attribute/bitvector/CMakeLists.txt b/searchlib/src/tests/attribute/bitvector/CMakeLists.txt
index bc65fc04dc4..9842b4169f0 100644
--- a/searchlib/src/tests/attribute/bitvector/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/bitvector/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_bitvector_test_app
+vespa_add_executable(searchlib_bitvector_test_app TEST
SOURCES
bitvector_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/attribute/comparator/CMakeLists.txt b/searchlib/src/tests/attribute/comparator/CMakeLists.txt
index 4a14181db3c..9069ee499d0 100644
--- a/searchlib/src/tests/attribute/comparator/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/comparator/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_comparator_test_app
+vespa_add_executable(searchlib_comparator_test_app TEST
SOURCES
comparator_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/attribute/document_weight_iterator/CMakeLists.txt b/searchlib/src/tests/attribute/document_weight_iterator/CMakeLists.txt
index 2a1b36a626d..8a6176d56c0 100644
--- a/searchlib/src/tests/attribute/document_weight_iterator/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/document_weight_iterator/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_document_weight_iterator_test_app
+vespa_add_executable(searchlib_document_weight_iterator_test_app TEST
SOURCES
document_weight_iterator_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/attribute/enumeratedsave/CMakeLists.txt b/searchlib/src/tests/attribute/enumeratedsave/CMakeLists.txt
index 0dbb59043c1..54f39e0633a 100644
--- a/searchlib/src/tests/attribute/enumeratedsave/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/enumeratedsave/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_enumeratedsave_test_app
+vespa_add_executable(searchlib_enumeratedsave_test_app TEST
SOURCES
enumeratedsave_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/attribute/enumstore/CMakeLists.txt b/searchlib/src/tests/attribute/enumstore/CMakeLists.txt
index 33190553747..f0657c83f51 100644
--- a/searchlib/src/tests/attribute/enumstore/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/enumstore/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_enumstore_test_app
+vespa_add_executable(searchlib_enumstore_test_app TEST
SOURCES
enumstore_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/attribute/extendattributes/CMakeLists.txt b/searchlib/src/tests/attribute/extendattributes/CMakeLists.txt
index b0803f0a232..207519951ae 100644
--- a/searchlib/src/tests/attribute/extendattributes/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/extendattributes/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_extendattribute_test_app
+vespa_add_executable(searchlib_extendattribute_test_app TEST
SOURCES
extendattribute.cpp
DEPENDS
diff --git a/searchlib/src/tests/attribute/multivaluemapping/CMakeLists.txt b/searchlib/src/tests/attribute/multivaluemapping/CMakeLists.txt
index 36c66b09966..3cb99c84d16 100644
--- a/searchlib/src/tests/attribute/multivaluemapping/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/multivaluemapping/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_multivaluemapping_test_app
+vespa_add_executable(searchlib_multivaluemapping_test_app TEST
SOURCES
multivaluemapping_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/attribute/postinglist/CMakeLists.txt b/searchlib/src/tests/attribute/postinglist/CMakeLists.txt
index a22d1ae2fdc..b6621667678 100644
--- a/searchlib/src/tests/attribute/postinglist/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/postinglist/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_postinglist_test_app
+vespa_add_executable(searchlib_postinglist_test_app TEST
SOURCES
postinglist.cpp
DEPENDS
diff --git a/searchlib/src/tests/attribute/postinglistattribute/CMakeLists.txt b/searchlib/src/tests/attribute/postinglistattribute/CMakeLists.txt
index 77d137c7b6e..3b2f86a6509 100644
--- a/searchlib/src/tests/attribute/postinglistattribute/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/postinglistattribute/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_postinglistattribute_test_app
+vespa_add_executable(searchlib_postinglistattribute_test_app TEST
SOURCES
postinglistattribute_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/attribute/searchable/CMakeLists.txt b/searchlib/src/tests/attribute/searchable/CMakeLists.txt
index ed76520af29..d2f745b35ee 100644
--- a/searchlib/src/tests/attribute/searchable/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/searchable/CMakeLists.txt
@@ -1,19 +1,19 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_attribute_searchable_adapter_test_app
+vespa_add_executable(searchlib_attribute_searchable_adapter_test_app TEST
SOURCES
attribute_searchable_adapter_test.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_attribute_searchable_adapter_test_app COMMAND sh attribute_searchable_adapter_test.sh)
-vespa_add_executable(searchlib_attribute_weighted_set_blueprint_test_app
+vespa_add_executable(searchlib_attribute_weighted_set_blueprint_test_app TEST
SOURCES
attribute_weighted_set_blueprint_test.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_attribute_weighted_set_blueprint_test_app COMMAND searchlib_attribute_weighted_set_blueprint_test_app)
-vespa_add_executable(searchlib_attribute_blueprint_test_app
+vespa_add_executable(searchlib_attribute_blueprint_test_app TEST
SOURCES
attributeblueprint_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt b/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt
index 24652373a00..6a921ce242c 100644
--- a/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/searchcontext/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_searchcontext_test_app
+vespa_add_executable(searchlib_searchcontext_test_app TEST
SOURCES
searchcontext.cpp
DEPENDS
diff --git a/searchlib/src/tests/attribute/sourceselector/CMakeLists.txt b/searchlib/src/tests/attribute/sourceselector/CMakeLists.txt
index 24b7a75dd07..68b4c869bcc 100644
--- a/searchlib/src/tests/attribute/sourceselector/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/sourceselector/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_sourceselector_test_app
+vespa_add_executable(searchlib_sourceselector_test_app TEST
SOURCES
sourceselector_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/attribute/stringattribute/CMakeLists.txt b/searchlib/src/tests/attribute/stringattribute/CMakeLists.txt
index 032ce9cac4e..2aa39bcca48 100644
--- a/searchlib/src/tests/attribute/stringattribute/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/stringattribute/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_stringattribute_test_app
+vespa_add_executable(searchlib_stringattribute_test_app TEST
SOURCES
stringattribute_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/attribute/tensorattribute/CMakeLists.txt b/searchlib/src/tests/attribute/tensorattribute/CMakeLists.txt
index ec16b4363eb..81b7bc9b1cf 100644
--- a/searchlib/src/tests/attribute/tensorattribute/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/tensorattribute/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_tensorattribute_test_app
+vespa_add_executable(searchlib_tensorattribute_test_app TEST
SOURCES
tensorattribute_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/bitcompression/expgolomb/CMakeLists.txt b/searchlib/src/tests/bitcompression/expgolomb/CMakeLists.txt
index f724773dfd6..2eaf6e29314 100644
--- a/searchlib/src/tests/bitcompression/expgolomb/CMakeLists.txt
+++ b/searchlib/src/tests/bitcompression/expgolomb/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_expgolomb_test_app
+vespa_add_executable(searchlib_expgolomb_test_app TEST
SOURCES
expgolomb_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/btree/CMakeLists.txt b/searchlib/src/tests/btree/CMakeLists.txt
index d88953d43fd..8a8a83c1239 100644
--- a/searchlib/src/tests/btree/CMakeLists.txt
+++ b/searchlib/src/tests/btree/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_btreeaggregation_test_app
+vespa_add_executable(searchlib_btreeaggregation_test_app TEST
SOURCES
btreeaggregation_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/bytecomplens/CMakeLists.txt b/searchlib/src/tests/bytecomplens/CMakeLists.txt
index 188c3fccbdf..b152a93e26c 100644
--- a/searchlib/src/tests/bytecomplens/CMakeLists.txt
+++ b/searchlib/src/tests/bytecomplens/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_bytecomp_test_app
+vespa_add_executable(searchlib_bytecomp_test_app TEST
SOURCES
bytecomp.cpp
DEPENDS
diff --git a/searchlib/src/tests/common/bitvector/CMakeLists.txt b/searchlib/src/tests/common/bitvector/CMakeLists.txt
index ce49872319a..cb87c749d47 100644
--- a/searchlib/src/tests/common/bitvector/CMakeLists.txt
+++ b/searchlib/src/tests/common/bitvector/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_bitvector_test-common_app
+vespa_add_executable(searchlib_bitvector_test-common_app TEST
SOURCES
bitvector_test.cpp
DEPENDS
@@ -13,7 +13,7 @@ vespa_add_executable(searchlib_bitvector_benchmark_app
searchlib
)
vespa_add_test(NAME searchlib_bitvector_benchmark_app COMMAND searchlib_bitvector_benchmark_app BENCHMARK)
-vespa_add_executable(searchlib_condensedbitvector_test_app
+vespa_add_executable(searchlib_condensedbitvector_test_app TEST
SOURCES
condensedbitvector_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/common/foregroundtaskexecutor/CMakeLists.txt b/searchlib/src/tests/common/foregroundtaskexecutor/CMakeLists.txt
index dd0e5c0b039..67eebbfe53a 100644
--- a/searchlib/src/tests/common/foregroundtaskexecutor/CMakeLists.txt
+++ b/searchlib/src/tests/common/foregroundtaskexecutor/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_foregroundtaskexecutor_test_app
+vespa_add_executable(searchlib_foregroundtaskexecutor_test_app TEST
SOURCES
foregroundtaskexecutor_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/common/location/CMakeLists.txt b/searchlib/src/tests/common/location/CMakeLists.txt
index 3617657cdf9..7664e89a022 100644
--- a/searchlib/src/tests/common/location/CMakeLists.txt
+++ b/searchlib/src/tests/common/location/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_location_test_app
+vespa_add_executable(searchlib_location_test_app TEST
SOURCES
location_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/common/packets/CMakeLists.txt b/searchlib/src/tests/common/packets/CMakeLists.txt
index e35883b1d8c..0df9e15f3d1 100644
--- a/searchlib/src/tests/common/packets/CMakeLists.txt
+++ b/searchlib/src/tests/common/packets/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_packets_test_app
+vespa_add_executable(searchlib_packets_test_app TEST
SOURCES
packets_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/common/rcuvector/CMakeLists.txt b/searchlib/src/tests/common/rcuvector/CMakeLists.txt
index 362dbf68dca..bb5e91c4da4 100644
--- a/searchlib/src/tests/common/rcuvector/CMakeLists.txt
+++ b/searchlib/src/tests/common/rcuvector/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_rcuvector_test_app
+vespa_add_executable(searchlib_rcuvector_test_app TEST
SOURCES
rcuvector_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/common/resultset/CMakeLists.txt b/searchlib/src/tests/common/resultset/CMakeLists.txt
index 0aed46f6e89..79b6db17cf8 100644
--- a/searchlib/src/tests/common/resultset/CMakeLists.txt
+++ b/searchlib/src/tests/common/resultset/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_resultset_test_app
+vespa_add_executable(searchlib_resultset_test_app TEST
SOURCES
resultset_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/common/sequencedtaskexecutor/CMakeLists.txt b/searchlib/src/tests/common/sequencedtaskexecutor/CMakeLists.txt
index 501fd3b07f1..8db4b51c690 100644
--- a/searchlib/src/tests/common/sequencedtaskexecutor/CMakeLists.txt
+++ b/searchlib/src/tests/common/sequencedtaskexecutor/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_sequencedtaskexecutor_test_app
+vespa_add_executable(searchlib_sequencedtaskexecutor_test_app TEST
SOURCES
sequencedtaskexecutor_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/common/summaryfeatures/CMakeLists.txt b/searchlib/src/tests/common/summaryfeatures/CMakeLists.txt
index 3b6cb392615..6207106dafe 100644
--- a/searchlib/src/tests/common/summaryfeatures/CMakeLists.txt
+++ b/searchlib/src/tests/common/summaryfeatures/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_summaryfeatures_test_app
+vespa_add_executable(searchlib_summaryfeatures_test_app TEST
SOURCES
summaryfeatures.cpp
DEPENDS
diff --git a/searchlib/src/tests/datastore/CMakeLists.txt b/searchlib/src/tests/datastore/CMakeLists.txt
index b10bc4d4e09..576393d1a34 100644
--- a/searchlib/src/tests/datastore/CMakeLists.txt
+++ b/searchlib/src/tests/datastore/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_logdatastore_test_app
+vespa_add_executable(searchlib_logdatastore_test_app TEST
SOURCES
logdatastore_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/diskindex/bitvector/CMakeLists.txt b/searchlib/src/tests/diskindex/bitvector/CMakeLists.txt
index 27c03b483ab..dbeb0cdc366 100644
--- a/searchlib/src/tests/diskindex/bitvector/CMakeLists.txt
+++ b/searchlib/src/tests/diskindex/bitvector/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_bitvector_test-diskindex_app
+vespa_add_executable(searchlib_bitvector_test-diskindex_app TEST
SOURCES
bitvector_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/diskindex/diskindex/CMakeLists.txt b/searchlib/src/tests/diskindex/diskindex/CMakeLists.txt
index 7cee100f534..f300f80ad3e 100644
--- a/searchlib/src/tests/diskindex/diskindex/CMakeLists.txt
+++ b/searchlib/src/tests/diskindex/diskindex/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_diskindex_test_app
+vespa_add_executable(searchlib_diskindex_test_app TEST
SOURCES
diskindex_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt b/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt
index a03313fac35..f13f49a9051 100644
--- a/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt
+++ b/searchlib/src/tests/diskindex/fieldwriter/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_fieldwriter_test_app
+vespa_add_executable(searchlib_fieldwriter_test_app TEST
SOURCES
fieldwriter_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/diskindex/fusion/CMakeLists.txt b/searchlib/src/tests/diskindex/fusion/CMakeLists.txt
index 9c079b09c90..2449a4e2dc1 100644
--- a/searchlib/src/tests/diskindex/fusion/CMakeLists.txt
+++ b/searchlib/src/tests/diskindex/fusion/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_fusion_test_app
+vespa_add_executable(searchlib_fusion_test_app TEST
SOURCES
fusion_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/diskindex/pagedict4/CMakeLists.txt b/searchlib/src/tests/diskindex/pagedict4/CMakeLists.txt
index f8aef573c9a..b7c9b8cc9c0 100644
--- a/searchlib/src/tests/diskindex/pagedict4/CMakeLists.txt
+++ b/searchlib/src/tests/diskindex/pagedict4/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_pagedict4_test_app
+vespa_add_executable(searchlib_pagedict4_test_app TEST
SOURCES
pagedict4test.cpp
DEPENDS
diff --git a/searchlib/src/tests/document_store/CMakeLists.txt b/searchlib/src/tests/document_store/CMakeLists.txt
index 18b9e408fae..f782c3d45e0 100644
--- a/searchlib/src/tests/document_store/CMakeLists.txt
+++ b/searchlib/src/tests/document_store/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_document_store_test_app
+vespa_add_executable(searchlib_document_store_test_app TEST
SOURCES
document_store_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/document_store/visitor/CMakeLists.txt b/searchlib/src/tests/document_store/visitor/CMakeLists.txt
index 976463bdfe8..0cac84d2427 100644
--- a/searchlib/src/tests/document_store/visitor/CMakeLists.txt
+++ b/searchlib/src/tests/document_store/visitor/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_document_store_visitor_test_app
+vespa_add_executable(searchlib_document_store_visitor_test_app TEST
SOURCES
document_store_visitor_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/engine/docsumapi/CMakeLists.txt b/searchlib/src/tests/engine/docsumapi/CMakeLists.txt
index a8fbe70de4b..0a191d28f02 100644
--- a/searchlib/src/tests/engine/docsumapi/CMakeLists.txt
+++ b/searchlib/src/tests/engine/docsumapi/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_docsumapi_test_app
+vespa_add_executable(searchlib_docsumapi_test_app TEST
SOURCES
docsumapi_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/engine/monitorapi/CMakeLists.txt b/searchlib/src/tests/engine/monitorapi/CMakeLists.txt
index f78a8e04fd1..c8e6b37a1b6 100644
--- a/searchlib/src/tests/engine/monitorapi/CMakeLists.txt
+++ b/searchlib/src/tests/engine/monitorapi/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_monitorapi_test_app
+vespa_add_executable(searchlib_monitorapi_test_app TEST
SOURCES
monitorapi_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/engine/searchapi/CMakeLists.txt b/searchlib/src/tests/engine/searchapi/CMakeLists.txt
index 89d1b8197a5..12b7f94ca3f 100644
--- a/searchlib/src/tests/engine/searchapi/CMakeLists.txt
+++ b/searchlib/src/tests/engine/searchapi/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_searchapi_test_app
+vespa_add_executable(searchlib_searchapi_test_app TEST
SOURCES
searchapi_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/engine/transportserver/CMakeLists.txt b/searchlib/src/tests/engine/transportserver/CMakeLists.txt
index 502279bc728..eac2ecfabea 100644
--- a/searchlib/src/tests/engine/transportserver/CMakeLists.txt
+++ b/searchlib/src/tests/engine/transportserver/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_transportserver_test_app
+vespa_add_executable(searchlib_transportserver_test_app TEST
SOURCES
transportserver_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/features/CMakeLists.txt b/searchlib/src/tests/features/CMakeLists.txt
index f1703b02c8b..965366f6ab8 100644
--- a/searchlib/src/tests/features/CMakeLists.txt
+++ b/searchlib/src/tests/features/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_prod_features_test_app
+vespa_add_executable(searchlib_prod_features_test_app TEST
SOURCES
prod_features.cpp
prod_features_framework.cpp
diff --git a/searchlib/src/tests/features/beta/CMakeLists.txt b/searchlib/src/tests/features/beta/CMakeLists.txt
index ee7020f01fc..9dc4597e8a0 100644
--- a/searchlib/src/tests/features/beta/CMakeLists.txt
+++ b/searchlib/src/tests/features/beta/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_beta_features_test_app
+vespa_add_executable(searchlib_beta_features_test_app TEST
SOURCES
beta_features.cpp
DEPENDS
diff --git a/searchlib/src/tests/features/element_completeness/CMakeLists.txt b/searchlib/src/tests/features/element_completeness/CMakeLists.txt
index aee13befe2d..fd2d96c5cd7 100644
--- a/searchlib/src/tests/features/element_completeness/CMakeLists.txt
+++ b/searchlib/src/tests/features/element_completeness/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_element_completeness_test_app
+vespa_add_executable(searchlib_element_completeness_test_app TEST
SOURCES
element_completeness_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/features/element_similarity_feature/CMakeLists.txt b/searchlib/src/tests/features/element_similarity_feature/CMakeLists.txt
index 08e3b04cd73..ac6ca3ff9b4 100644
--- a/searchlib/src/tests/features/element_similarity_feature/CMakeLists.txt
+++ b/searchlib/src/tests/features/element_similarity_feature/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_element_similarity_feature_test_app
+vespa_add_executable(searchlib_element_similarity_feature_test_app TEST
SOURCES
element_similarity_feature_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/features/euclidean_distance/CMakeLists.txt b/searchlib/src/tests/features/euclidean_distance/CMakeLists.txt
index d79aa9572bc..eb50d4478c9 100644
--- a/searchlib/src/tests/features/euclidean_distance/CMakeLists.txt
+++ b/searchlib/src/tests/features/euclidean_distance/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_euclidean_distance_test_app
+vespa_add_executable(searchlib_euclidean_distance_test_app TEST
SOURCES
euclidean_distance_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/features/item_raw_score/CMakeLists.txt b/searchlib/src/tests/features/item_raw_score/CMakeLists.txt
index 24ef339133c..b1eb50f20cf 100644
--- a/searchlib/src/tests/features/item_raw_score/CMakeLists.txt
+++ b/searchlib/src/tests/features/item_raw_score/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_item_raw_score_test_app
+vespa_add_executable(searchlib_item_raw_score_test_app TEST
SOURCES
item_raw_score_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/features/native_dot_product/CMakeLists.txt b/searchlib/src/tests/features/native_dot_product/CMakeLists.txt
index 2dad758c82d..973b022c2e2 100644
--- a/searchlib/src/tests/features/native_dot_product/CMakeLists.txt
+++ b/searchlib/src/tests/features/native_dot_product/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_native_dot_product_test_app
+vespa_add_executable(searchlib_native_dot_product_test_app TEST
SOURCES
native_dot_product_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/features/ranking_expression/CMakeLists.txt b/searchlib/src/tests/features/ranking_expression/CMakeLists.txt
index 4caddaa7bd8..abc91572d50 100644
--- a/searchlib/src/tests/features/ranking_expression/CMakeLists.txt
+++ b/searchlib/src/tests/features/ranking_expression/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_ranking_expression_test_app
+vespa_add_executable(searchlib_ranking_expression_test_app TEST
SOURCES
ranking_expression_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/features/raw_score/CMakeLists.txt b/searchlib/src/tests/features/raw_score/CMakeLists.txt
index a672b7b071d..c25004e1931 100644
--- a/searchlib/src/tests/features/raw_score/CMakeLists.txt
+++ b/searchlib/src/tests/features/raw_score/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_raw_score_test_app
+vespa_add_executable(searchlib_raw_score_test_app TEST
SOURCES
raw_score_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/features/subqueries/CMakeLists.txt b/searchlib/src/tests/features/subqueries/CMakeLists.txt
index 45845e8ec1b..4d0d8a41bbf 100644
--- a/searchlib/src/tests/features/subqueries/CMakeLists.txt
+++ b/searchlib/src/tests/features/subqueries/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_subqueries_test_app
+vespa_add_executable(searchlib_subqueries_test_app TEST
SOURCES
subqueries_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/features/tensor/CMakeLists.txt b/searchlib/src/tests/features/tensor/CMakeLists.txt
index 33f7d44d8fe..dd06994370d 100644
--- a/searchlib/src/tests/features/tensor/CMakeLists.txt
+++ b/searchlib/src/tests/features/tensor/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_tensor_test_app
+vespa_add_executable(searchlib_tensor_test_app TEST
SOURCES
tensor_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/features/tensor_from_labels/CMakeLists.txt b/searchlib/src/tests/features/tensor_from_labels/CMakeLists.txt
index db1814a0f66..ba13082c78f 100644
--- a/searchlib/src/tests/features/tensor_from_labels/CMakeLists.txt
+++ b/searchlib/src/tests/features/tensor_from_labels/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_tensor_from_labels_test_app
+vespa_add_executable(searchlib_tensor_from_labels_test_app TEST
SOURCES
tensor_from_labels_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/features/tensor_from_weighted_set/CMakeLists.txt b/searchlib/src/tests/features/tensor_from_weighted_set/CMakeLists.txt
index 7c38b301679..8bab4853ca6 100644
--- a/searchlib/src/tests/features/tensor_from_weighted_set/CMakeLists.txt
+++ b/searchlib/src/tests/features/tensor_from_weighted_set/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_tensor_from_weighted_set_test_app
+vespa_add_executable(searchlib_tensor_from_weighted_set_test_app TEST
SOURCES
tensor_from_weighted_set_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/features/text_similarity_feature/CMakeLists.txt b/searchlib/src/tests/features/text_similarity_feature/CMakeLists.txt
index e0cb043c8f1..a40ba17bcbe 100644
--- a/searchlib/src/tests/features/text_similarity_feature/CMakeLists.txt
+++ b/searchlib/src/tests/features/text_similarity_feature/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_text_similarity_feature_test_app
+vespa_add_executable(searchlib_text_similarity_feature_test_app TEST
SOURCES
text_similarity_feature_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/features/util/CMakeLists.txt b/searchlib/src/tests/features/util/CMakeLists.txt
index 95a0bf3b45d..7db3768d737 100644
--- a/searchlib/src/tests/features/util/CMakeLists.txt
+++ b/searchlib/src/tests/features/util/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_util_test_app
+vespa_add_executable(searchlib_util_test_app TEST
SOURCES
util_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/fef/CMakeLists.txt b/searchlib/src/tests/fef/CMakeLists.txt
index a239ba972c3..e85d544807b 100644
--- a/searchlib/src/tests/fef/CMakeLists.txt
+++ b/searchlib/src/tests/fef/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_fef_test_app
+vespa_add_executable(searchlib_fef_test_app TEST
SOURCES
fef_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/fef/attributecontent/CMakeLists.txt b/searchlib/src/tests/fef/attributecontent/CMakeLists.txt
index 84cdb3d4fce..fcfc2129166 100644
--- a/searchlib/src/tests/fef/attributecontent/CMakeLists.txt
+++ b/searchlib/src/tests/fef/attributecontent/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_attributecontent_test_app
+vespa_add_executable(searchlib_attributecontent_test_app TEST
SOURCES
attributecontent_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/fef/featurenamebuilder/CMakeLists.txt b/searchlib/src/tests/fef/featurenamebuilder/CMakeLists.txt
index 167642c1337..9d8576fc36b 100644
--- a/searchlib/src/tests/fef/featurenamebuilder/CMakeLists.txt
+++ b/searchlib/src/tests/fef/featurenamebuilder/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_featurenamebuilder_test_app
+vespa_add_executable(searchlib_featurenamebuilder_test_app TEST
SOURCES
featurenamebuilder_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/fef/featurenameparser/CMakeLists.txt b/searchlib/src/tests/fef/featurenameparser/CMakeLists.txt
index e313ee24deb..7a2b4530123 100644
--- a/searchlib/src/tests/fef/featurenameparser/CMakeLists.txt
+++ b/searchlib/src/tests/fef/featurenameparser/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_featurenameparser_test_app
+vespa_add_executable(searchlib_featurenameparser_test_app TEST
SOURCES
featurenameparser_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/fef/featureoverride/CMakeLists.txt b/searchlib/src/tests/fef/featureoverride/CMakeLists.txt
index 23370d51d22..365f171597f 100644
--- a/searchlib/src/tests/fef/featureoverride/CMakeLists.txt
+++ b/searchlib/src/tests/fef/featureoverride/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_featureoverride_test_app
+vespa_add_executable(searchlib_featureoverride_test_app TEST
SOURCES
featureoverride.cpp
DEPENDS
diff --git a/searchlib/src/tests/fef/object_passing/CMakeLists.txt b/searchlib/src/tests/fef/object_passing/CMakeLists.txt
index 2334711f015..3c60f99b131 100644
--- a/searchlib/src/tests/fef/object_passing/CMakeLists.txt
+++ b/searchlib/src/tests/fef/object_passing/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_object_passing_test_app
+vespa_add_executable(searchlib_object_passing_test_app TEST
SOURCES
object_passing_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/fef/parameter/CMakeLists.txt b/searchlib/src/tests/fef/parameter/CMakeLists.txt
index dcd45390ce3..36e0ea0b9db 100644
--- a/searchlib/src/tests/fef/parameter/CMakeLists.txt
+++ b/searchlib/src/tests/fef/parameter/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_parameter_test_app
+vespa_add_executable(searchlib_parameter_test_app TEST
SOURCES
parameter_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/fef/phrasesplitter/CMakeLists.txt b/searchlib/src/tests/fef/phrasesplitter/CMakeLists.txt
index aa16f3e0a0d..84ac2ef7280 100644
--- a/searchlib/src/tests/fef/phrasesplitter/CMakeLists.txt
+++ b/searchlib/src/tests/fef/phrasesplitter/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_phrasesplitter_test_app
+vespa_add_executable(searchlib_phrasesplitter_test_app TEST
SOURCES
phrasesplitter_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/fef/properties/CMakeLists.txt b/searchlib/src/tests/fef/properties/CMakeLists.txt
index 0b74b10cb31..ec5805b4aaf 100644
--- a/searchlib/src/tests/fef/properties/CMakeLists.txt
+++ b/searchlib/src/tests/fef/properties/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_properties_test_app
+vespa_add_executable(searchlib_properties_test_app TEST
SOURCES
properties_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/fef/rank_program/CMakeLists.txt b/searchlib/src/tests/fef/rank_program/CMakeLists.txt
index 12d971a9421..1ab20a0de59 100644
--- a/searchlib/src/tests/fef/rank_program/CMakeLists.txt
+++ b/searchlib/src/tests/fef/rank_program/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_rank_program_test_app
+vespa_add_executable(searchlib_rank_program_test_app TEST
SOURCES
rank_program_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/fef/resolver/CMakeLists.txt b/searchlib/src/tests/fef/resolver/CMakeLists.txt
index 835a50fd6fb..aceb8e84573 100644
--- a/searchlib/src/tests/fef/resolver/CMakeLists.txt
+++ b/searchlib/src/tests/fef/resolver/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_resolver_test_app
+vespa_add_executable(searchlib_resolver_test_app TEST
SOURCES
resolver_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/fef/table/CMakeLists.txt b/searchlib/src/tests/fef/table/CMakeLists.txt
index ca61eb7c365..ce5d24e3540 100644
--- a/searchlib/src/tests/fef/table/CMakeLists.txt
+++ b/searchlib/src/tests/fef/table/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_table_test_app
+vespa_add_executable(searchlib_table_test_app TEST
SOURCES
table_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/fef/termfieldmodel/CMakeLists.txt b/searchlib/src/tests/fef/termfieldmodel/CMakeLists.txt
index c8a678c11bb..5519f88cb71 100644
--- a/searchlib/src/tests/fef/termfieldmodel/CMakeLists.txt
+++ b/searchlib/src/tests/fef/termfieldmodel/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_termfieldmodel_test_app
+vespa_add_executable(searchlib_termfieldmodel_test_app TEST
SOURCES
termfieldmodel_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/fef/termmatchdatamerger/CMakeLists.txt b/searchlib/src/tests/fef/termmatchdatamerger/CMakeLists.txt
index cfb6ae2611f..7ea18aedab3 100644
--- a/searchlib/src/tests/fef/termmatchdatamerger/CMakeLists.txt
+++ b/searchlib/src/tests/fef/termmatchdatamerger/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_termmatchdatamerger_test_app
+vespa_add_executable(searchlib_termmatchdatamerger_test_app TEST
SOURCES
termmatchdatamerger_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/fileheaderinspect/CMakeLists.txt b/searchlib/src/tests/fileheaderinspect/CMakeLists.txt
index 024e83bde02..1369cbdde0d 100644
--- a/searchlib/src/tests/fileheaderinspect/CMakeLists.txt
+++ b/searchlib/src/tests/fileheaderinspect/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_fileheaderinspect_test_app
+vespa_add_executable(searchlib_fileheaderinspect_test_app TEST
SOURCES
fileheaderinspect.cpp
DEPENDS
diff --git a/searchlib/src/tests/fileheadertk/CMakeLists.txt b/searchlib/src/tests/fileheadertk/CMakeLists.txt
index bc6969fbac2..809c220954d 100644
--- a/searchlib/src/tests/fileheadertk/CMakeLists.txt
+++ b/searchlib/src/tests/fileheadertk/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_fileheadertk_test_app
+vespa_add_executable(searchlib_fileheadertk_test_app TEST
SOURCES
fileheadertk_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/forcelink/CMakeLists.txt b/searchlib/src/tests/forcelink/CMakeLists.txt
index 50e39d2d844..48c9b4fd1a3 100644
--- a/searchlib/src/tests/forcelink/CMakeLists.txt
+++ b/searchlib/src/tests/forcelink/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_forcelink_test_app
+vespa_add_executable(searchlib_forcelink_test_app TEST
SOURCES
forcelink.cpp
DEPENDS
diff --git a/searchlib/src/tests/grouping/CMakeLists.txt b/searchlib/src/tests/grouping/CMakeLists.txt
index ef44472edfc..d9e3abfae59 100644
--- a/searchlib/src/tests/grouping/CMakeLists.txt
+++ b/searchlib/src/tests/grouping/CMakeLists.txt
@@ -1,26 +1,26 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_grouping_test_app
+vespa_add_executable(searchlib_grouping_test_app TEST
SOURCES
grouping_test.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_grouping_test_app COMMAND searchlib_grouping_test_app)
-vespa_add_executable(searchlib_hyperloglog_test_app
+vespa_add_executable(searchlib_hyperloglog_test_app TEST
SOURCES
hyperloglog_test.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_hyperloglog_test_app COMMAND searchlib_hyperloglog_test_app)
-vespa_add_executable(searchlib_sketch_test_app
+vespa_add_executable(searchlib_sketch_test_app TEST
SOURCES
sketch_test.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_sketch_test_app COMMAND searchlib_sketch_test_app)
-vespa_add_executable(searchlib_grouping_serialization_test_app
+vespa_add_executable(searchlib_grouping_serialization_test_app TEST
SOURCES
grouping_serialization_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/hitcollector/CMakeLists.txt b/searchlib/src/tests/hitcollector/CMakeLists.txt
index c2b130b2890..ca3f29f83e1 100644
--- a/searchlib/src/tests/hitcollector/CMakeLists.txt
+++ b/searchlib/src/tests/hitcollector/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_hitcollector_test_app
+vespa_add_executable(searchlib_hitcollector_test_app TEST
SOURCES
hitcollector_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/index/docbuilder/CMakeLists.txt b/searchlib/src/tests/index/docbuilder/CMakeLists.txt
index de382bcc2fe..c7f49cfa4b6 100644
--- a/searchlib/src/tests/index/docbuilder/CMakeLists.txt
+++ b/searchlib/src/tests/index/docbuilder/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_docbuilder_test_app
+vespa_add_executable(searchlib_docbuilder_test_app TEST
SOURCES
docbuilder_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/index/doctypebuilder/CMakeLists.txt b/searchlib/src/tests/index/doctypebuilder/CMakeLists.txt
index 51fb59421f9..562b34c5120 100644
--- a/searchlib/src/tests/index/doctypebuilder/CMakeLists.txt
+++ b/searchlib/src/tests/index/doctypebuilder/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_doctypebuilder_test_app
+vespa_add_executable(searchlib_doctypebuilder_test_app TEST
SOURCES
doctypebuilder_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/indexmetainfo/CMakeLists.txt b/searchlib/src/tests/indexmetainfo/CMakeLists.txt
index 607ab7b7e5b..6932793a319 100644
--- a/searchlib/src/tests/indexmetainfo/CMakeLists.txt
+++ b/searchlib/src/tests/indexmetainfo/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_indexmetainfo_test_app
+vespa_add_executable(searchlib_indexmetainfo_test_app TEST
SOURCES
indexmetainfo_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/ld-library-path/CMakeLists.txt b/searchlib/src/tests/ld-library-path/CMakeLists.txt
index 47e1372ffc6..2f0af32041e 100644
--- a/searchlib/src/tests/ld-library-path/CMakeLists.txt
+++ b/searchlib/src/tests/ld-library-path/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_ld-library-path_test_app
+vespa_add_executable(searchlib_ld-library-path_test_app TEST
SOURCES
ld-library-path.cpp
DEPENDS
diff --git a/searchlib/src/tests/memoryindex/btree/CMakeLists.txt b/searchlib/src/tests/memoryindex/btree/CMakeLists.txt
index 8b523030cab..768b35874ca 100644
--- a/searchlib/src/tests/memoryindex/btree/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/btree/CMakeLists.txt
@@ -1,12 +1,12 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_btree_test_app
+vespa_add_executable(searchlib_btree_test_app TEST
SOURCES
btree_test.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_btree_test_app COMMAND searchlib_btree_test_app)
-vespa_add_executable(searchlib_frozenbtree_test_app
+vespa_add_executable(searchlib_frozenbtree_test_app TEST
SOURCES
frozenbtree_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/memoryindex/compact_document_words_store/CMakeLists.txt b/searchlib/src/tests/memoryindex/compact_document_words_store/CMakeLists.txt
index 666639f20ba..c2bdcd34bf8 100644
--- a/searchlib/src/tests/memoryindex/compact_document_words_store/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/compact_document_words_store/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_compact_document_words_store_test_app
+vespa_add_executable(searchlib_compact_document_words_store_test_app TEST
SOURCES
compact_document_words_store_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/memoryindex/datastore/CMakeLists.txt b/searchlib/src/tests/memoryindex/datastore/CMakeLists.txt
index da45288fe5e..de59c92e590 100644
--- a/searchlib/src/tests/memoryindex/datastore/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/datastore/CMakeLists.txt
@@ -1,19 +1,19 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_datastore_test_app
+vespa_add_executable(searchlib_datastore_test_app TEST
SOURCES
datastore_test.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_datastore_test_app COMMAND searchlib_datastore_test_app)
-vespa_add_executable(searchlib_featurestore_test_app
+vespa_add_executable(searchlib_featurestore_test_app TEST
SOURCES
featurestore_test.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_featurestore_test_app COMMAND searchlib_featurestore_test_app)
-vespa_add_executable(searchlib_wordstore_test_app
+vespa_add_executable(searchlib_wordstore_test_app TEST
SOURCES
wordstore_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/memoryindex/dictionary/CMakeLists.txt b/searchlib/src/tests/memoryindex/dictionary/CMakeLists.txt
index 9520b37d267..28d5de7310a 100644
--- a/searchlib/src/tests/memoryindex/dictionary/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/dictionary/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_dictionary_test_app
+vespa_add_executable(searchlib_dictionary_test_app TEST
SOURCES
dictionary_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/memoryindex/document_remover/CMakeLists.txt b/searchlib/src/tests/memoryindex/document_remover/CMakeLists.txt
index e918d0400b2..238ce902783 100644
--- a/searchlib/src/tests/memoryindex/document_remover/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/document_remover/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_document_remover_test_app
+vespa_add_executable(searchlib_document_remover_test_app TEST
SOURCES
document_remover_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/memoryindex/documentinverter/CMakeLists.txt b/searchlib/src/tests/memoryindex/documentinverter/CMakeLists.txt
index 85a77fad361..0d546f6f986 100644
--- a/searchlib/src/tests/memoryindex/documentinverter/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/documentinverter/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_documentinverter_test_app
+vespa_add_executable(searchlib_documentinverter_test_app TEST
SOURCES
documentinverter_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/memoryindex/fieldinverter/CMakeLists.txt b/searchlib/src/tests/memoryindex/fieldinverter/CMakeLists.txt
index 9d81ebbb57c..4e73c27bf17 100644
--- a/searchlib/src/tests/memoryindex/fieldinverter/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/fieldinverter/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_fieldinverter_test_app
+vespa_add_executable(searchlib_fieldinverter_test_app TEST
SOURCES
fieldinverter_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/memoryindex/memoryindex/CMakeLists.txt b/searchlib/src/tests/memoryindex/memoryindex/CMakeLists.txt
index f25089e85bb..a0230479346 100644
--- a/searchlib/src/tests/memoryindex/memoryindex/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/memoryindex/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_memoryindex_test_app
+vespa_add_executable(searchlib_memoryindex_test_app TEST
SOURCES
memoryindex_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/memoryindex/urlfieldinverter/CMakeLists.txt b/searchlib/src/tests/memoryindex/urlfieldinverter/CMakeLists.txt
index c5a0374fad9..22f7916f834 100644
--- a/searchlib/src/tests/memoryindex/urlfieldinverter/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/urlfieldinverter/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_urlfieldinverter_test_app
+vespa_add_executable(searchlib_urlfieldinverter_test_app TEST
SOURCES
urlfieldinverter_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/memorytub/CMakeLists.txt b/searchlib/src/tests/memorytub/CMakeLists.txt
index a06fb4de8e2..bdb2c7d2ca3 100644
--- a/searchlib/src/tests/memorytub/CMakeLists.txt
+++ b/searchlib/src/tests/memorytub/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_test_memorytub_app
+vespa_add_executable(searchlib_test_memorytub_app TEST
SOURCES
memorytub_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/nativerank/CMakeLists.txt b/searchlib/src/tests/nativerank/CMakeLists.txt
index dc9542a4988..3938cd298c6 100644
--- a/searchlib/src/tests/nativerank/CMakeLists.txt
+++ b/searchlib/src/tests/nativerank/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_nativerank_test_app
+vespa_add_executable(searchlib_nativerank_test_app TEST
SOURCES
nativerank.cpp
DEPENDS
diff --git a/searchlib/src/tests/nearsearch/CMakeLists.txt b/searchlib/src/tests/nearsearch/CMakeLists.txt
index a526a059a3d..65b5275e227 100644
--- a/searchlib/src/tests/nearsearch/CMakeLists.txt
+++ b/searchlib/src/tests/nearsearch/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_nearsearch_test_app
+vespa_add_executable(searchlib_nearsearch_test_app TEST
SOURCES
nearsearch_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/postinglistbm/CMakeLists.txt b/searchlib/src/tests/postinglistbm/CMakeLists.txt
index 403c12da1b1..77d24b1f829 100644
--- a/searchlib/src/tests/postinglistbm/CMakeLists.txt
+++ b/searchlib/src/tests/postinglistbm/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_postinglistbm_app
+vespa_add_executable(searchlib_postinglistbm_app TEST
SOURCES
postinglistbm.cpp
andstress.cpp
diff --git a/searchlib/src/tests/predicate/CMakeLists.txt b/searchlib/src/tests/predicate/CMakeLists.txt
index cd15356eeee..3b29e1badc6 100644
--- a/searchlib/src/tests/predicate/CMakeLists.txt
+++ b/searchlib/src/tests/predicate/CMakeLists.txt
@@ -1,89 +1,89 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_predicate_index_test_app
+vespa_add_executable(searchlib_predicate_index_test_app TEST
SOURCES
predicate_index_test.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_predicate_index_test_app COMMAND searchlib_predicate_index_test_app)
-vespa_add_executable(searchlib_simple_index_test_app
+vespa_add_executable(searchlib_simple_index_test_app TEST
SOURCES
simple_index_test.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_simple_index_test_app COMMAND searchlib_simple_index_test_app)
-vespa_add_executable(searchlib_tree_crumbs_test_app
+vespa_add_executable(searchlib_tree_crumbs_test_app TEST
SOURCES
tree_crumbs_test.cpp
DEPENDS
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
+vespa_add_executable(searchlib_predicate_tree_analyzer_test_app TEST
SOURCES
predicate_tree_analyzer_test.cpp
DEPENDS
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
+vespa_add_executable(searchlib_predicate_tree_annotator_test_app TEST
SOURCES
predicate_tree_annotator_test.cpp
DEPENDS
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
+vespa_add_executable(searchlib_predicate_interval_store_test_app TEST
SOURCES
predicate_interval_store_test.cpp
DEPENDS
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
+vespa_add_executable(searchlib_document_features_store_test_app TEST
SOURCES
document_features_store_test.cpp
DEPENDS
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
+vespa_add_executable(searchlib_predicate_ref_cache_test_app TEST
SOURCES
predicate_ref_cache_test.cpp
DEPENDS
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
+vespa_add_executable(searchlib_predicate_interval_posting_list_test_app TEST
SOURCES
predicate_interval_posting_list_test.cpp
DEPENDS
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
+vespa_add_executable(searchlib_predicate_bounds_posting_list_test_app TEST
SOURCES
predicate_bounds_posting_list_test.cpp
DEPENDS
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
+vespa_add_executable(searchlib_predicate_zero_constraint_posting_list_test_app TEST
SOURCES
predicate_zero_constraint_posting_list_test.cpp
DEPENDS
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
+vespa_add_executable(searchlib_predicate_zstar_compressed_posting_list_test_app TEST
SOURCES
predicate_zstar_compressed_posting_list_test.cpp
DEPENDS
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
+vespa_add_executable(searchlib_predicate_range_term_expander_test_app TEST
SOURCES
predicate_range_term_expander_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/prettyfloat/CMakeLists.txt b/searchlib/src/tests/prettyfloat/CMakeLists.txt
index 74e91518030..f40ce1e3a16 100644
--- a/searchlib/src/tests/prettyfloat/CMakeLists.txt
+++ b/searchlib/src/tests/prettyfloat/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_prettyfloat_test_app
+vespa_add_executable(searchlib_prettyfloat_test_app TEST
SOURCES
prettyfloat.cpp
DEPENDS
diff --git a/searchlib/src/tests/query/CMakeLists.txt b/searchlib/src/tests/query/CMakeLists.txt
index 16a75b7142a..48cac7b94c3 100644
--- a/searchlib/src/tests/query/CMakeLists.txt
+++ b/searchlib/src/tests/query/CMakeLists.txt
@@ -1,47 +1,47 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_query_visitor_test_app
+vespa_add_executable(searchlib_query_visitor_test_app TEST
SOURCES
query_visitor_test.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_query_visitor_test_app COMMAND searchlib_query_visitor_test_app)
-vespa_add_executable(searchlib_customtypevisitor_test_app
+vespa_add_executable(searchlib_customtypevisitor_test_app TEST
SOURCES
customtypevisitor_test.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_customtypevisitor_test_app COMMAND searchlib_customtypevisitor_test_app)
-vespa_add_executable(searchlib_templatetermvisitor_test_app
+vespa_add_executable(searchlib_templatetermvisitor_test_app TEST
SOURCES
templatetermvisitor_test.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_templatetermvisitor_test_app COMMAND searchlib_templatetermvisitor_test_app)
-vespa_add_executable(searchlib_querybuilder_test_app
+vespa_add_executable(searchlib_querybuilder_test_app TEST
SOURCES
querybuilder_test.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_querybuilder_test_app COMMAND searchlib_querybuilder_test_app)
-vespa_add_executable(searchlib_stackdumpquerycreator_test_app
+vespa_add_executable(searchlib_stackdumpquerycreator_test_app TEST
SOURCES
stackdumpquerycreator_test.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_stackdumpquerycreator_test_app COMMAND searchlib_stackdumpquerycreator_test_app)
-vespa_add_executable(searchlib_query-old_test_app
+vespa_add_executable(searchlib_query-old_test_app TEST
SOURCES
query-old.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_query-old_test_app COMMAND searchlib_query-old_test_app)
-vespa_add_executable(searchlib_query-old-large_test_app
+vespa_add_executable(searchlib_query-old-large_test_app TEST
SOURCES
query-old-large.cpp
DEPENDS
diff --git a/searchlib/src/tests/queryeval/CMakeLists.txt b/searchlib/src/tests/queryeval/CMakeLists.txt
index 35496b7f99a..7cd607f8470 100644
--- a/searchlib/src/tests/queryeval/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_queryeval_test_app
+vespa_add_executable(searchlib_queryeval_test_app TEST
SOURCES
queryeval.cpp
DEPENDS
diff --git a/searchlib/src/tests/queryeval/blueprint/CMakeLists.txt b/searchlib/src/tests/queryeval/blueprint/CMakeLists.txt
index 88ba3deeb29..cb84fd6a557 100644
--- a/searchlib/src/tests/queryeval/blueprint/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/blueprint/CMakeLists.txt
@@ -1,19 +1,19 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_blueprint_test_app
+vespa_add_executable(searchlib_blueprint_test_app TEST
SOURCES
blueprint_test.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_blueprint_test_app COMMAND searchlib_blueprint_test_app || diff -u lhs.out rhs.out)
-vespa_add_executable(searchlib_leaf_blueprints_test_app
+vespa_add_executable(searchlib_leaf_blueprints_test_app TEST
SOURCES
leaf_blueprints_test.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_leaf_blueprints_test_app COMMAND searchlib_leaf_blueprints_test_app || diff -u lhs.out rhs.out)
-vespa_add_executable(searchlib_intermediate_blueprints_test_app
+vespa_add_executable(searchlib_intermediate_blueprints_test_app TEST
SOURCES
intermediate_blueprints_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/queryeval/booleanmatchiteratorwrapper/CMakeLists.txt b/searchlib/src/tests/queryeval/booleanmatchiteratorwrapper/CMakeLists.txt
index cf701c430aa..60d21c532aa 100644
--- a/searchlib/src/tests/queryeval/booleanmatchiteratorwrapper/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/booleanmatchiteratorwrapper/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_booleanmatchiteratorwrapper_test_app
+vespa_add_executable(searchlib_booleanmatchiteratorwrapper_test_app TEST
SOURCES
booleanmatchiteratorwrapper_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/queryeval/dot_product/CMakeLists.txt b/searchlib/src/tests/queryeval/dot_product/CMakeLists.txt
index 91b78f2e54d..d2ff2eebc4a 100644
--- a/searchlib/src/tests/queryeval/dot_product/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/dot_product/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_dot_product_test_app
+vespa_add_executable(searchlib_dot_product_test_app TEST
SOURCES
dot_product_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/queryeval/equiv/CMakeLists.txt b/searchlib/src/tests/queryeval/equiv/CMakeLists.txt
index 695e9b87121..6252021f40c 100644
--- a/searchlib/src/tests/queryeval/equiv/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/equiv/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_equiv_test_app
+vespa_add_executable(searchlib_equiv_test_app TEST
SOURCES
equiv_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/queryeval/fake_searchable/CMakeLists.txt b/searchlib/src/tests/queryeval/fake_searchable/CMakeLists.txt
index 75eaae7d9ed..6b6f7007323 100644
--- a/searchlib/src/tests/queryeval/fake_searchable/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/fake_searchable/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_fake_searchable_test_app
+vespa_add_executable(searchlib_fake_searchable_test_app TEST
SOURCES
fake_searchable_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/queryeval/getnodeweight/CMakeLists.txt b/searchlib/src/tests/queryeval/getnodeweight/CMakeLists.txt
index 5502e2c033b..2e5ffaa495b 100644
--- a/searchlib/src/tests/queryeval/getnodeweight/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/getnodeweight/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_getnodeweight_test_app
+vespa_add_executable(searchlib_getnodeweight_test_app TEST
SOURCES
getnodeweight_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/queryeval/monitoring_search_iterator/CMakeLists.txt b/searchlib/src/tests/queryeval/monitoring_search_iterator/CMakeLists.txt
index eebc9c8cf17..aefa2312992 100644
--- a/searchlib/src/tests/queryeval/monitoring_search_iterator/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/monitoring_search_iterator/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_monitoring_search_iterator_test_app
+vespa_add_executable(searchlib_monitoring_search_iterator_test_app TEST
SOURCES
monitoring_search_iterator_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/queryeval/multibitvectoriterator/CMakeLists.txt b/searchlib/src/tests/queryeval/multibitvectoriterator/CMakeLists.txt
index 1bac095225f..dcae2ee1d61 100644
--- a/searchlib/src/tests/queryeval/multibitvectoriterator/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/multibitvectoriterator/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_multibitvectoriterator_test_app
+vespa_add_executable(searchlib_multibitvectoriterator_test_app TEST
SOURCES
multibitvectoriterator_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/queryeval/parallel_weak_and/CMakeLists.txt b/searchlib/src/tests/queryeval/parallel_weak_and/CMakeLists.txt
index b76286bea65..6a946bd0681 100644
--- a/searchlib/src/tests/queryeval/parallel_weak_and/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/parallel_weak_and/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_parallel_weak_and_test_app
+vespa_add_executable(searchlib_parallel_weak_and_test_app TEST
SOURCES
parallel_weak_and_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/queryeval/predicate/CMakeLists.txt b/searchlib/src/tests/queryeval/predicate/CMakeLists.txt
index e1c4ebf9aa8..4d823cc1d54 100644
--- a/searchlib/src/tests/queryeval/predicate/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/predicate/CMakeLists.txt
@@ -1,12 +1,12 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_predicate_blueprint_test_app
+vespa_add_executable(searchlib_predicate_blueprint_test_app TEST
SOURCES
predicate_blueprint_test.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_predicate_blueprint_test_app COMMAND searchlib_predicate_blueprint_test_app)
-vespa_add_executable(searchlib_predicate_search_test_app
+vespa_add_executable(searchlib_predicate_search_test_app TEST
SOURCES
predicate_search_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/queryeval/simple_phrase/CMakeLists.txt b/searchlib/src/tests/queryeval/simple_phrase/CMakeLists.txt
index bc9e664a8cf..05c281854aa 100644
--- a/searchlib/src/tests/queryeval/simple_phrase/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/simple_phrase/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_simple_phrase_test_app
+vespa_add_executable(searchlib_simple_phrase_test_app TEST
SOURCES
simple_phrase_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/queryeval/sourceblender/CMakeLists.txt b/searchlib/src/tests/queryeval/sourceblender/CMakeLists.txt
index e566cb0fdf0..b712a01f1b9 100644
--- a/searchlib/src/tests/queryeval/sourceblender/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/sourceblender/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_sourceblender_test_app
+vespa_add_executable(searchlib_sourceblender_test_app TEST
SOURCES
sourceblender.cpp
DEPENDS
diff --git a/searchlib/src/tests/queryeval/termwise_eval/CMakeLists.txt b/searchlib/src/tests/queryeval/termwise_eval/CMakeLists.txt
index ab9362f6e99..ea94f2b99f1 100644
--- a/searchlib/src/tests/queryeval/termwise_eval/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/termwise_eval/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_termwise_eval_test_app
+vespa_add_executable(searchlib_termwise_eval_test_app TEST
SOURCES
termwise_eval_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/queryeval/weak_and/CMakeLists.txt b/searchlib/src/tests/queryeval/weak_and/CMakeLists.txt
index b3839ac75f3..c621219227d 100644
--- a/searchlib/src/tests/queryeval/weak_and/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/weak_and/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_weak_and_test_app
+vespa_add_executable(searchlib_weak_and_test_app TEST
SOURCES
weak_and_test.cpp
DEPENDS
@@ -7,7 +7,7 @@ vespa_add_executable(searchlib_weak_and_test_app
searchlib_test
)
vespa_add_test(NAME searchlib_weak_and_test_app COMMAND searchlib_weak_and_test_app)
-vespa_add_executable(searchlib_weak_and_test_expensive_app
+vespa_add_executable(searchlib_weak_and_test_expensive_app TEST
SOURCES
weak_and_test_expensive.cpp
DEPENDS
diff --git a/searchlib/src/tests/queryeval/weak_and_heap/CMakeLists.txt b/searchlib/src/tests/queryeval/weak_and_heap/CMakeLists.txt
index cacf4987aff..afad2d28349 100644
--- a/searchlib/src/tests/queryeval/weak_and_heap/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/weak_and_heap/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_weak_and_heap_test_app
+vespa_add_executable(searchlib_weak_and_heap_test_app TEST
SOURCES
weak_and_heap_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/queryeval/weak_and_scorers/CMakeLists.txt b/searchlib/src/tests/queryeval/weak_and_scorers/CMakeLists.txt
index 74a37c8fce8..8f163933a33 100644
--- a/searchlib/src/tests/queryeval/weak_and_scorers/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/weak_and_scorers/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_weak_and_scorers_test_app
+vespa_add_executable(searchlib_weak_and_scorers_test_app TEST
SOURCES
weak_and_scorers_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/queryeval/weighted_set_term/CMakeLists.txt b/searchlib/src/tests/queryeval/weighted_set_term/CMakeLists.txt
index 4083762d115..e0d943035e9 100644
--- a/searchlib/src/tests/queryeval/weighted_set_term/CMakeLists.txt
+++ b/searchlib/src/tests/queryeval/weighted_set_term/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_weighted_set_term_test_app
+vespa_add_executable(searchlib_weighted_set_term_test_app TEST
SOURCES
weighted_set_term_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/rankingexpression/feature_name_extractor/CMakeLists.txt b/searchlib/src/tests/rankingexpression/feature_name_extractor/CMakeLists.txt
index b1b81efd840..4fbd0b73d34 100644
--- a/searchlib/src/tests/rankingexpression/feature_name_extractor/CMakeLists.txt
+++ b/searchlib/src/tests/rankingexpression/feature_name_extractor/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_feature_name_extractor_test_app
+vespa_add_executable(searchlib_feature_name_extractor_test_app TEST
SOURCES
feature_name_extractor_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/ranksetup/CMakeLists.txt b/searchlib/src/tests/ranksetup/CMakeLists.txt
index 712f1ffefa4..454375f65b1 100644
--- a/searchlib/src/tests/ranksetup/CMakeLists.txt
+++ b/searchlib/src/tests/ranksetup/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_ranksetup_test_app
+vespa_add_executable(searchlib_ranksetup_test_app TEST
SOURCES
ranksetup_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/ranksetup/verify_feature/CMakeLists.txt b/searchlib/src/tests/ranksetup/verify_feature/CMakeLists.txt
index 8ffd79fe327..a648cc79917 100644
--- a/searchlib/src/tests/ranksetup/verify_feature/CMakeLists.txt
+++ b/searchlib/src/tests/ranksetup/verify_feature/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_verify_feature_test_app
+vespa_add_executable(searchlib_verify_feature_test_app TEST
SOURCES
verify_feature_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/sortresults/CMakeLists.txt b/searchlib/src/tests/sortresults/CMakeLists.txt
index 6889e4c517d..3f0a892d10f 100644
--- a/searchlib/src/tests/sortresults/CMakeLists.txt
+++ b/searchlib/src/tests/sortresults/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_sortresults_app
+vespa_add_executable(searchlib_sortresults_app TEST
SOURCES
sorttest.cpp
DEPENDS
diff --git a/searchlib/src/tests/sortspec/CMakeLists.txt b/searchlib/src/tests/sortspec/CMakeLists.txt
index a436bb744c5..a59a5c102f7 100644
--- a/searchlib/src/tests/sortspec/CMakeLists.txt
+++ b/searchlib/src/tests/sortspec/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_multilevelsort_test_app
+vespa_add_executable(searchlib_multilevelsort_test_app TEST
SOURCES
multilevelsort.cpp
DEPENDS
diff --git a/searchlib/src/tests/stackdumpiterator/CMakeLists.txt b/searchlib/src/tests/stackdumpiterator/CMakeLists.txt
index dceeaad3f26..a3148d0b068 100644
--- a/searchlib/src/tests/stackdumpiterator/CMakeLists.txt
+++ b/searchlib/src/tests/stackdumpiterator/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_stackdumpiteratortest_app
+vespa_add_executable(searchlib_stackdumpiteratortest_app TEST
SOURCES
stackdumpiteratortest.cpp
DEPENDS
diff --git a/searchlib/src/tests/stringenum/CMakeLists.txt b/searchlib/src/tests/stringenum/CMakeLists.txt
index b59e739be47..b608aeceecc 100644
--- a/searchlib/src/tests/stringenum/CMakeLists.txt
+++ b/searchlib/src/tests/stringenum/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_stringenum_test_app
+vespa_add_executable(searchlib_stringenum_test_app TEST
SOURCES
stringenum_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/transactionlog/CMakeLists.txt b/searchlib/src/tests/transactionlog/CMakeLists.txt
index 545c81ba45f..1b59b5834f8 100644
--- a/searchlib/src/tests/transactionlog/CMakeLists.txt
+++ b/searchlib/src/tests/transactionlog/CMakeLists.txt
@@ -1,12 +1,12 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_translogserver_test_app
+vespa_add_executable(searchlib_translogserver_test_app TEST
SOURCES
translogserver_test.cpp
DEPENDS
searchlib
)
vespa_add_test(NAME searchlib_translogserver_test_app COMMAND searchlib_translogserver_test_app)
-vespa_add_executable(searchlib_translogclient_test_app
+vespa_add_executable(searchlib_translogclient_test_app TEST
SOURCES
translogclient_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/true/CMakeLists.txt b/searchlib/src/tests/true/CMakeLists.txt
index f7c80db8f92..c78cf8ad388 100644
--- a/searchlib/src/tests/true/CMakeLists.txt
+++ b/searchlib/src/tests/true/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_true_test_app
+vespa_add_executable(searchlib_true_test_app TEST
SOURCES
true.cpp
DEPENDS
diff --git a/searchlib/src/tests/url/CMakeLists.txt b/searchlib/src/tests/url/CMakeLists.txt
index aa52f3d8374..f09ec7c9ca5 100644
--- a/searchlib/src/tests/url/CMakeLists.txt
+++ b/searchlib/src/tests/url/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_testurl_app
+vespa_add_executable(searchlib_testurl_app TEST
SOURCES
testurl.cpp
DEPENDS
diff --git a/searchlib/src/tests/util/CMakeLists.txt b/searchlib/src/tests/util/CMakeLists.txt
index 43fec57c182..5303f125c3b 100644
--- a/searchlib/src/tests/util/CMakeLists.txt
+++ b/searchlib/src/tests/util/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_rawbuf_test_app
+vespa_add_executable(searchlib_rawbuf_test_app TEST
SOURCES
rawbuf_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/util/bufferwriter/CMakeLists.txt b/searchlib/src/tests/util/bufferwriter/CMakeLists.txt
index a57749ff853..efe91549e1f 100644
--- a/searchlib/src/tests/util/bufferwriter/CMakeLists.txt
+++ b/searchlib/src/tests/util/bufferwriter/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_bufferwriter_test_app
+vespa_add_executable(searchlib_bufferwriter_test_app TEST
SOURCES
bufferwriter_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/util/ioerrorhandler/CMakeLists.txt b/searchlib/src/tests/util/ioerrorhandler/CMakeLists.txt
index 92d6ab30d72..8963b14b60e 100644
--- a/searchlib/src/tests/util/ioerrorhandler/CMakeLists.txt
+++ b/searchlib/src/tests/util/ioerrorhandler/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_ioerrorhandler_test_app
+vespa_add_executable(searchlib_ioerrorhandler_test_app TEST
SOURCES
ioerrorhandler_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/util/searchable_stats/CMakeLists.txt b/searchlib/src/tests/util/searchable_stats/CMakeLists.txt
index 3bc0fbe9c6b..c679fdd1097 100644
--- a/searchlib/src/tests/util/searchable_stats/CMakeLists.txt
+++ b/searchlib/src/tests/util/searchable_stats/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_searchable_stats_test_app
+vespa_add_executable(searchlib_searchable_stats_test_app TEST
SOURCES
searchable_stats_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/util/sigbushandler/CMakeLists.txt b/searchlib/src/tests/util/sigbushandler/CMakeLists.txt
index a55e1e354c7..7896c719822 100644
--- a/searchlib/src/tests/util/sigbushandler/CMakeLists.txt
+++ b/searchlib/src/tests/util/sigbushandler/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_sigbushandler_test_app
+vespa_add_executable(searchlib_sigbushandler_test_app TEST
SOURCES
sigbushandler_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/util/slime_output_raw_buf_adapter/CMakeLists.txt b/searchlib/src/tests/util/slime_output_raw_buf_adapter/CMakeLists.txt
index 0735511fe7a..3a273ee589a 100644
--- a/searchlib/src/tests/util/slime_output_raw_buf_adapter/CMakeLists.txt
+++ b/searchlib/src/tests/util/slime_output_raw_buf_adapter/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_slime_output_raw_buf_adapter_test_app
+vespa_add_executable(searchlib_slime_output_raw_buf_adapter_test_app TEST
SOURCES
slime_output_raw_buf_adapter_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/util/statebuf/CMakeLists.txt b/searchlib/src/tests/util/statebuf/CMakeLists.txt
index 0b24cd1552b..c162c3bc461 100644
--- a/searchlib/src/tests/util/statebuf/CMakeLists.txt
+++ b/searchlib/src/tests/util/statebuf/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_statebuf_test_app
+vespa_add_executable(searchlib_statebuf_test_app TEST
SOURCES
statebuf_test.cpp
DEPENDS
diff --git a/searchlib/src/tests/util/statefile/CMakeLists.txt b/searchlib/src/tests/util/statefile/CMakeLists.txt
index b90b87fce7d..37410d67473 100644
--- a/searchlib/src/tests/util/statefile/CMakeLists.txt
+++ b/searchlib/src/tests/util/statefile/CMakeLists.txt
@@ -1,5 +1,5 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_statefile_test_app
+vespa_add_executable(searchlib_statefile_test_app TEST
SOURCES
statefile_test.cpp
DEPENDS