aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVegard Sjonfjell <vegardsjo@gmail.com>2016-06-16 14:55:49 +0200
committerGitHub <noreply@github.com>2016-06-16 14:55:49 +0200
commitbedc4838fdf4b6b8191d4a3f86418390d6858085 (patch)
tree84fa040d60a3d79185b26ab23461012e3f9c18e7
parentdc1728a835c6b2d7378e8e77134a4f40a496c2ce (diff)
parent9ffb5969ff851b6661d966b182ab4cdc90bb7100 (diff)
Merge pull request #14 from yahoo/vegard/optionally-build-unit-tests
Vegard/optionally build unit tests
-rw-r--r--build_settings.cmake3
-rw-r--r--config/src/tests/api/CMakeLists.txt2
-rw-r--r--config/src/tests/configagent/CMakeLists.txt2
-rw-r--r--config/src/tests/configfetcher/CMakeLists.txt2
-rw-r--r--config/src/tests/configformat/CMakeLists.txt2
-rw-r--r--config/src/tests/configgen/CMakeLists.txt8
-rw-r--r--config/src/tests/configholder/CMakeLists.txt2
-rw-r--r--config/src/tests/configmanager/CMakeLists.txt2
-rw-r--r--config/src/tests/configparser/CMakeLists.txt2
-rw-r--r--config/src/tests/configretriever/CMakeLists.txt2
-rw-r--r--config/src/tests/configuri/CMakeLists.txt2
-rw-r--r--config/src/tests/failover/CMakeLists.txt2
-rw-r--r--config/src/tests/file_subscription/CMakeLists.txt2
-rw-r--r--config/src/tests/frt/CMakeLists.txt2
-rw-r--r--config/src/tests/frtconnectionpool/CMakeLists.txt2
-rw-r--r--config/src/tests/functiontest/CMakeLists.txt2
-rw-r--r--config/src/tests/getconfig/CMakeLists.txt2
-rw-r--r--config/src/tests/legacysubscriber/CMakeLists.txt2
-rw-r--r--config/src/tests/misc/CMakeLists.txt2
-rw-r--r--config/src/tests/payload_converter/CMakeLists.txt2
-rw-r--r--config/src/tests/print/CMakeLists.txt2
-rw-r--r--config/src/tests/raw_subscription/CMakeLists.txt2
-rw-r--r--config/src/tests/subscriber/CMakeLists.txt2
-rw-r--r--config/src/tests/subscription/CMakeLists.txt2
-rw-r--r--config/src/tests/trace/CMakeLists.txt2
-rw-r--r--config/src/tests/unittest/CMakeLists.txt2
-rw-r--r--configd/src/tests/messages/CMakeLists.txt2
-rw-r--r--configutil/src/tests/config_status/CMakeLists.txt2
-rw-r--r--configutil/src/tests/model_inspect/CMakeLists.txt2
-rw-r--r--configutil/src/tests/tags/CMakeLists.txt2
-rw-r--r--document/src/tests/CMakeLists.txt2
-rw-r--r--document/src/tests/annotation/CMakeLists.txt2
-rw-r--r--document/src/tests/base/CMakeLists.txt2
-rw-r--r--document/src/tests/datatype/CMakeLists.txt2
-rw-r--r--document/src/tests/fieldvalue/CMakeLists.txt6
-rw-r--r--document/src/tests/predicate/CMakeLists.txt6
-rw-r--r--document/src/tests/repo/CMakeLists.txt2
-rw-r--r--document/src/tests/serialization/CMakeLists.txt6
-rw-r--r--document/src/tests/struct_anno/CMakeLists.txt2
-rw-r--r--document/src/tests/tensor_fieldvalue/CMakeLists.txt2
-rw-r--r--documentapi/src/tests/loadtypes/CMakeLists.txt2
-rw-r--r--documentapi/src/tests/messagebus/CMakeLists.txt2
-rw-r--r--documentapi/src/tests/messages/CMakeLists.txt8
-rw-r--r--documentapi/src/tests/policies/CMakeLists.txt2
-rw-r--r--documentapi/src/tests/policyfactory/CMakeLists.txt2
-rw-r--r--documentapi/src/tests/priority/CMakeLists.txt2
-rw-r--r--documentapi/src/tests/replymerger/CMakeLists.txt2
-rw-r--r--documentapi/src/tests/routablefactory/CMakeLists.txt2
-rw-r--r--documentapi/src/tests/systemstate/CMakeLists.txt2
-rw-r--r--fastlib/src/vespa/fastlib/io/tests/CMakeLists.txt4
-rw-r--r--fastlib/src/vespa/fastlib/net/tests/CMakeLists.txt2
-rw-r--r--fastlib/src/vespa/fastlib/text/tests/CMakeLists.txt6
-rw-r--r--fastlib/src/vespa/fastlib/util/tests/CMakeLists.txt6
-rw-r--r--fastos/src/tests/CMakeLists.txt18
-rw-r--r--fbench/src/test/CMakeLists.txt6
-rw-r--r--filedistribution/src/tests/common/CMakeLists.txt2
-rw-r--r--filedistribution/src/tests/filedbmodelimpl/CMakeLists.txt2
-rw-r--r--filedistribution/src/tests/filedownloader/CMakeLists.txt2
-rw-r--r--filedistribution/src/tests/rpc/CMakeLists.txt2
-rw-r--r--filedistribution/src/tests/scheduler/CMakeLists.txt2
-rw-r--r--filedistribution/src/tests/status/CMakeLists.txt2
-rw-r--r--filedistribution/src/tests/zkfiledbmodel/CMakeLists.txt2
-rw-r--r--fnet/src/tests/connect_thread/CMakeLists.txt2
-rw-r--r--fnet/src/tests/connection_spread/CMakeLists.txt2
-rw-r--r--fnet/src/tests/databuffer/CMakeLists.txt2
-rw-r--r--fnet/src/tests/examples/CMakeLists.txt2
-rw-r--r--fnet/src/tests/fdselector/CMakeLists.txt2
-rw-r--r--fnet/src/tests/frt/memorytub/CMakeLists.txt2
-rw-r--r--fnet/src/tests/frt/method_pt/CMakeLists.txt2
-rw-r--r--fnet/src/tests/frt/parallel_rpc/CMakeLists.txt2
-rw-r--r--fnet/src/tests/frt/rpc/CMakeLists.txt8
-rw-r--r--fnet/src/tests/frt/values/CMakeLists.txt2
-rw-r--r--fnet/src/tests/info/CMakeLists.txt2
-rw-r--r--fnet/src/tests/locking/CMakeLists.txt6
-rw-r--r--fnet/src/tests/printstuff/CMakeLists.txt2
-rw-r--r--fnet/src/tests/scheduling/CMakeLists.txt4
-rw-r--r--fnet/src/tests/sync_execute/CMakeLists.txt2
-rw-r--r--fnet/src/tests/thread_selection/CMakeLists.txt2
-rw-r--r--fnet/src/tests/time/CMakeLists.txt2
-rw-r--r--fsa/src/alltest/CMakeLists.txt2
-rw-r--r--functions.cmake19
-rw-r--r--jrt_test/src/tests/echo/CMakeLists.txt2
-rw-r--r--jrt_test/src/tests/mandatory-methods/CMakeLists.txt2
-rw-r--r--jrt_test/src/tests/mockup-invoke/CMakeLists.txt2
-rw-r--r--jrt_test/src/tests/rpc-error/CMakeLists.txt2
-rw-r--r--juniper/src/test/CMakeLists.txt14
-rw-r--r--logd/src/tests/forward/CMakeLists.txt2
-rw-r--r--logd/src/tests/info/CMakeLists.txt2
-rw-r--r--lowercasing_test/src/tests/hello-world/CMakeLists.txt2
-rw-r--r--lowercasing_test/src/tests/lowercasing/CMakeLists.txt4
-rw-r--r--memfilepersistence/src/tests/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/advancedrouting/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/auto-reply/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/blob/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/bucketsequence/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/choke/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/configagent/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/context/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/emptyreply/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/error/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/identity/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/loadbalance/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/messagebus/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/messageordering/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/messenger/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/oos/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/protocolrepository/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/queue/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/replygate/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/resender/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/result/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/retrypolicy/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/routable/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/routablequeue/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/routeparser/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/routing/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/routingcontext/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/routingspec/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/rpcserviceaddress/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/sendadapter/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/sequencer/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/serviceaddress/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/servicepool/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/shutdown/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/simple-roundtrip/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/simpleprotocol/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/slobrok/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/sourcesession/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/targetpool/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/throttling/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/timeout/CMakeLists.txt2
-rw-r--r--messagebus/src/tests/trace-roundtrip/CMakeLists.txt2
-rw-r--r--messagebus/test/src/tests/compile-cpp/CMakeLists.txt2
-rw-r--r--messagebus/test/src/tests/error/CMakeLists.txt2
-rw-r--r--messagebus/test/src/tests/errorcodes/CMakeLists.txt2
-rw-r--r--messagebus/test/src/tests/trace/CMakeLists.txt2
-rw-r--r--metrics/src/tests/CMakeLists.txt2
-rw-r--r--persistence/src/tests/CMakeLists.txt2
-rw-r--r--persistence/src/tests/dummyimpl/CMakeLists.txt2
-rw-r--r--persistence/src/tests/proxy/CMakeLists.txt2
-rw-r--r--searchcommon/src/tests/attribute/config/CMakeLists.txt2
-rw-r--r--searchcommon/src/tests/schema/CMakeLists.txt2
-rw-r--r--searchcore/src/apps/tests/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/applyattrupdates/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/fdispatch/randomrow/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/fdispatch/search_path/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/grouping/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/attribute/CMakeLists.txt4
-rw-r--r--searchcore/src/tests/proton/attribute/attribute_manager/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/attribute/attribute_populator/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/attribute/attribute_usage_filter/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/attribute/attributes_state_explorer/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/attribute/document_field_populator/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/attribute/exclusive_attribute_read_accessor/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/bucketdb/bucketdb/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/common/CMakeLists.txt6
-rw-r--r--searchcore/src/tests/proton/common/document_type_inspector/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/common/state_reporter_utils/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/config/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/docsummary/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/document_iterator/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/documentdb/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/documentdb/buckethandler/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/documentdb/clusterstatehandler/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/documentdb/combiningfeedview/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/documentdb/configurer/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/documentdb/configvalidator/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/documentdb/document_scan_iterator/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/documentdb/document_subdbs/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/documentdb/documentbucketmover/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/documentdb/documentdbconfig/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/documentdb/documentdbconfigscout/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/documentdb/feedview/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/documentdb/lid_space_compaction/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/documentdb/maintenancecontroller/CMakeLists.txt4
-rw-r--r--searchcore/src/tests/proton/documentdb/storeonlyfeedview/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/documentmetastore/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/documentmetastore/lidreusedelayer/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/feed_and_search/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/feedoperation/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/feedtoken/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/flushengine/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/index/CMakeLists.txt8
-rw-r--r--searchcore/src/tests/proton/index/index_writer/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/initializer/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/matchengine/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/matching/CMakeLists.txt14
-rw-r--r--searchcore/src/tests/proton/matching/docid_range_scheduler/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/matching/match_loop_communicator/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/matching/match_phase_limiter/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/matching/partial_result/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/metrics/documentdb_job_trackers/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/metrics/job_load_sampler/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/metrics/job_tracked_flush/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/metrics/metrics_engine/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/persistenceengine/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/reprocessing/reprocessing_runner/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/server/CMakeLists.txt10
-rw-r--r--searchcore/src/tests/proton/server/data_directory_upgrader/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/server/disk_mem_usage_filter/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/server/health_adapter/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/server/memoryflush/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/server/visibility_handler/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/statusreport/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/summaryengine/CMakeLists.txt2
-rw-r--r--searchcore/src/tests/proton/verify_ranksetup/CMakeLists.txt2
-rw-r--r--searchcorespi/src/tests/plugin/CMakeLists.txt4
-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
-rw-r--r--searchsummary/src/tests/docsumformat/CMakeLists.txt2
-rw-r--r--searchsummary/src/tests/docsummary/CMakeLists.txt2
-rw-r--r--searchsummary/src/tests/docsummary/slime_summary/CMakeLists.txt2
-rw-r--r--searchsummary/src/tests/extractkeywords/CMakeLists.txt2
-rw-r--r--slobrok/src/tests/backoff/CMakeLists.txt2
-rw-r--r--slobrok/src/tests/configure/CMakeLists.txt2
-rw-r--r--slobrok/src/tests/mirrorapi/CMakeLists.txt4
-rw-r--r--slobrok/src/tests/multi/CMakeLists.txt2
-rw-r--r--slobrok/src/tests/oldapi/CMakeLists.txt2
-rw-r--r--slobrok/src/tests/registerapi/CMakeLists.txt2
-rw-r--r--slobrok/src/tests/standalone/CMakeLists.txt2
-rw-r--r--slobrok/src/tests/startsome/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/array/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/bits/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/clock/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/cpu/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/crc/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/databuffer/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/directio/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/encoding/base64/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/fileheader/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/floatingpointtype/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/growablebytebuffer/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/json/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/librarypool/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/memorydatastore/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/objectdump/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/objects/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/objectselection/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/polymorphicarray/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/programoptions/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/rusage/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/shutdownguard/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/state_server/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/stllike/CMakeLists.txt4
-rw-r--r--staging_vespalib/src/tests/timer/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/trace/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/util/process_memory_stats/CMakeLists.txt2
-rw-r--r--staging_vespalib/src/tests/xmlserializable/CMakeLists.txt2
-rw-r--r--storage/src/tests/CMakeLists.txt2
-rw-r--r--storageapi/src/tests/CMakeLists.txt2
-rw-r--r--storageframework/src/tests/CMakeLists.txt2
-rw-r--r--storageserver/src/tests/CMakeLists.txt2
-rw-r--r--streamingvisitors/src/tests/hitcollector/CMakeLists.txt2
-rw-r--r--streamingvisitors/src/tests/querywrapper/CMakeLists.txt2
-rw-r--r--streamingvisitors/src/tests/searchvisitor/CMakeLists.txt2
-rw-r--r--vbench/src/tests/app_dumpurl/CMakeLists.txt2
-rw-r--r--vbench/src/tests/app_vbench/CMakeLists.txt2
-rw-r--r--vbench/src/tests/benchmark_headers/CMakeLists.txt2
-rw-r--r--vbench/src/tests/buffered_output/CMakeLists.txt2
-rw-r--r--vbench/src/tests/byte_input/CMakeLists.txt2
-rw-r--r--vbench/src/tests/dispatcher/CMakeLists.txt2
-rw-r--r--vbench/src/tests/dropped_tagger/CMakeLists.txt2
-rw-r--r--vbench/src/tests/handler_thread/CMakeLists.txt2
-rw-r--r--vbench/src/tests/hex_number/CMakeLists.txt2
-rw-r--r--vbench/src/tests/http_client/CMakeLists.txt2
-rw-r--r--vbench/src/tests/http_connection/CMakeLists.txt2
-rw-r--r--vbench/src/tests/http_connection_pool/CMakeLists.txt2
-rw-r--r--vbench/src/tests/input_file_reader/CMakeLists.txt2
-rw-r--r--vbench/src/tests/latency_analyzer/CMakeLists.txt2
-rw-r--r--vbench/src/tests/line_reader/CMakeLists.txt2
-rw-r--r--vbench/src/tests/mapped_file_input/CMakeLists.txt2
-rw-r--r--vbench/src/tests/memory/CMakeLists.txt2
-rw-r--r--vbench/src/tests/qps_analyzer/CMakeLists.txt2
-rw-r--r--vbench/src/tests/qps_tagger/CMakeLists.txt2
-rw-r--r--vbench/src/tests/request_dumper/CMakeLists.txt2
-rw-r--r--vbench/src/tests/request_generator/CMakeLists.txt2
-rw-r--r--vbench/src/tests/request_sink/CMakeLists.txt2
-rw-r--r--vbench/src/tests/server_socket/CMakeLists.txt2
-rw-r--r--vbench/src/tests/server_spec/CMakeLists.txt2
-rw-r--r--vbench/src/tests/server_tagger/CMakeLists.txt2
-rw-r--r--vbench/src/tests/simple_buffer/CMakeLists.txt2
-rw-r--r--vbench/src/tests/socket/CMakeLists.txt2
-rw-r--r--vbench/src/tests/taint/CMakeLists.txt2
-rw-r--r--vbench/src/tests/time_queue/CMakeLists.txt2
-rw-r--r--vbench/src/tests/timer/CMakeLists.txt2
-rw-r--r--vbench/src/tests/writable_memory/CMakeLists.txt2
-rw-r--r--vdslib/src/tests/CMakeLists.txt2
-rw-r--r--vdstestlib/src/tests/cppunit/CMakeLists.txt2
-rw-r--r--vdstestlib/src/tests/dirconfig/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/alignedmemory/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/alloc/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/approx/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/array/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/arrayqueue/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/atomic/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/barrier/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/box/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/closure/CMakeLists.txt4
-rw-r--r--vespalib/src/tests/component/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/compress/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/delegatelist/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/dual_merge_director/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/eval/compile_cache/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/eval/compiled_function/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/eval/function/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/eval/function_speed/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/eval/gbdt/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/eval/interpreted_function/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/eval/node_types/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/eval/simple_tensor/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/eval/tensor/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/eval/value_type/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/eventbarrier/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/exception_classes/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/executor/CMakeLists.txt4
-rw-r--r--vespalib/src/tests/explore_modern_cpp/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/fiddle/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/gencnt/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/guard/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/hashmap/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/host_name/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/io/fileutil/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/left_right_heap/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/linkedptr/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/make_fixture_macros/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/memory/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/net/socket/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/objects/nbostream/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/optimized/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/placement-delete/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/printable/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/priority_queue/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/random/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/referencecounter/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/regex/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/rendezvous/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/runnable_pair/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/rwlock/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/sha1/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/sharedptr/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/signalhandler/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/simple_thread_bundle/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/slaveproc/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/slime/CMakeLists.txt8
-rw-r--r--vespalib/src/tests/stash/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/stllike/CMakeLists.txt10
-rw-r--r--vespalib/src/tests/stringfmt/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/sync/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/tensor/compact_tensor_builder/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/tensor/compact_tensor_v2_builder/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/tensor/dense_tensor_builder/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/tensor/dense_tensor_operations/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/tensor/join_tensor_addresses/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/tensor/simple_tensor_builder/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/tensor/tensor/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/tensor/tensor_address/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/tensor/tensor_address_element_iterator/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/tensor/tensor_function/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/tensor/tensor_mapper/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/tensor/tensor_operations/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/tensor/tensor_performance/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/tensor/tensor_serialization/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/tensor/tensor_slime_serialization/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/tensor/tensor_type/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/testapp-debug/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/testapp-generic/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/testapp-main/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/testapp-state/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/testkit-mt/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/testkit-subset/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/testkit-testhook/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/text/lowercase/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/text/stringtokenizer/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/text/utf8/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/thread/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/time_tracker/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/trace/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/traits/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/true/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/tutorial/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/tutorial/fixtures/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/tutorial/minimal/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/tutorial/simple/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/tutorial/threads/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/util/generationhandler/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/valgrind/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/weakref/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/websocket/CMakeLists.txt2
-rw-r--r--vespalib/src/tests/zcurve/CMakeLists.txt4
-rw-r--r--vespalog/src/test/CMakeLists.txt6
-rw-r--r--vespalog/src/test/simple/CMakeLists.txt2
-rw-r--r--vespalog/src/test/threads/CMakeLists.txt2
-rw-r--r--vespamalloc/src/tests/doubledelete/CMakeLists.txt2
-rw-r--r--vespamalloc/src/tests/overwrite/CMakeLists.txt2
-rw-r--r--vespamalloc/src/tests/stacktrace/CMakeLists.txt2
-rw-r--r--vespamalloc/src/tests/test1/CMakeLists.txt2
-rw-r--r--vespamalloc/src/tests/test2/CMakeLists.txt2
-rw-r--r--vespamalloc/src/tests/thread/CMakeLists.txt2
-rw-r--r--vsm/src/tests/charbuffer/CMakeLists.txt2
-rw-r--r--vsm/src/tests/docsum/CMakeLists.txt2
-rw-r--r--vsm/src/tests/document/CMakeLists.txt2
-rw-r--r--vsm/src/tests/searcher/CMakeLists.txt2
-rw-r--r--vsm/src/tests/textutil/CMakeLists.txt2
539 files changed, 658 insertions, 652 deletions
diff --git a/build_settings.cmake b/build_settings.cmake
index 7898ccf00fc..59f73dc3e70 100644
--- a/build_settings.cmake
+++ b/build_settings.cmake
@@ -3,6 +3,9 @@
if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
set(OS_IS_MACOSX true)
endif()
+# Build options
+# Whether to build unit tests as part of the 'all' target
+set(EXCLUDE_TESTS_FROM_ALL FALSE CACHE BOOL "If TRUE, do not build tests as part of the 'all' target")
# Warnings
set(WARN_OPTS "-Wuninitialized -Werror -Wall -W -Wchar-subscripts -Wcomment -Wformat -Wparentheses -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings")
diff --git a/config/src/tests/api/CMakeLists.txt b/config/src/tests/api/CMakeLists.txt
index 93d12a5dc66..ef99f267586 100644
--- a/config/src/tests/api/CMakeLists.txt
+++ b/config/src/tests/api/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(config_api_test_app
+vespa_add_executable(config_api_test_app TEST
SOURCES
api.cpp
DEPENDS
diff --git a/config/src/tests/configagent/CMakeLists.txt b/config/src/tests/configagent/CMakeLists.txt
index 715e5260e30..b7a3bc941a2 100644
--- a/config/src/tests/configagent/CMakeLists.txt
+++ b/config/src/tests/configagent/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(config_configagent_test_app
+vespa_add_executable(config_configagent_test_app TEST
SOURCES
configagent.cpp
DEPENDS
diff --git a/config/src/tests/configfetcher/CMakeLists.txt b/config/src/tests/configfetcher/CMakeLists.txt
index 58598815f7d..ce87bd49b85 100644
--- a/config/src/tests/configfetcher/CMakeLists.txt
+++ b/config/src/tests/configfetcher/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(config_configfetcher_test_app
+vespa_add_executable(config_configfetcher_test_app TEST
SOURCES
configfetcher.cpp
DEPENDS
diff --git a/config/src/tests/configformat/CMakeLists.txt b/config/src/tests/configformat/CMakeLists.txt
index f17215bc66c..112e807cc42 100644
--- a/config/src/tests/configformat/CMakeLists.txt
+++ b/config/src/tests/configformat/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(config_configformat_test_app
+vespa_add_executable(config_configformat_test_app TEST
SOURCES
configformat.cpp
DEPENDS
diff --git a/config/src/tests/configgen/CMakeLists.txt b/config/src/tests/configgen/CMakeLists.txt
index 8a71b737919..263a646a315 100644
--- a/config/src/tests/configgen/CMakeLists.txt
+++ b/config/src/tests/configgen/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(config_configgen_test_app
+vespa_add_executable(config_configgen_test_app TEST
SOURCES
configgen.cpp
DEPENDS
@@ -7,21 +7,21 @@ vespa_add_executable(config_configgen_test_app
)
vespa_add_test(NAME config_configgen_test_app COMMAND config_configgen_test_app)
vespa_generate_config(config_configgen_test_app ../../test/resources/configdefinitions/motd.def)
-vespa_add_executable(config_vector_inserter_test_app
+vespa_add_executable(config_vector_inserter_test_app TEST
SOURCES
vector_inserter.cpp
DEPENDS
config_cloudconfig
)
vespa_add_test(NAME config_vector_inserter_test_app COMMAND config_vector_inserter_test_app)
-vespa_add_executable(config_map_inserter_test_app
+vespa_add_executable(config_map_inserter_test_app TEST
SOURCES
map_inserter.cpp
DEPENDS
config_cloudconfig
)
vespa_add_test(NAME config_map_inserter_test_app COMMAND config_map_inserter_test_app)
-vespa_add_executable(config_value_converter_test_app
+vespa_add_executable(config_value_converter_test_app TEST
SOURCES
value_converter.cpp
DEPENDS
diff --git a/config/src/tests/configholder/CMakeLists.txt b/config/src/tests/configholder/CMakeLists.txt
index 050160d2ad3..e0c83aeef8f 100644
--- a/config/src/tests/configholder/CMakeLists.txt
+++ b/config/src/tests/configholder/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(config_configholder_test_app
+vespa_add_executable(config_configholder_test_app TEST
SOURCES
configholder.cpp
DEPENDS
diff --git a/config/src/tests/configmanager/CMakeLists.txt b/config/src/tests/configmanager/CMakeLists.txt
index 87c11296dea..d12e09a6564 100644
--- a/config/src/tests/configmanager/CMakeLists.txt
+++ b/config/src/tests/configmanager/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(config_configmanager_test_app
+vespa_add_executable(config_configmanager_test_app TEST
SOURCES
configmanager.cpp
DEPENDS
diff --git a/config/src/tests/configparser/CMakeLists.txt b/config/src/tests/configparser/CMakeLists.txt
index d2bdaf09d40..3a14d9c2ee3 100644
--- a/config/src/tests/configparser/CMakeLists.txt
+++ b/config/src/tests/configparser/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(config_configparser_test_app
+vespa_add_executable(config_configparser_test_app TEST
SOURCES
configparser.cpp
DEPENDS
diff --git a/config/src/tests/configretriever/CMakeLists.txt b/config/src/tests/configretriever/CMakeLists.txt
index 5c0d8152734..89fd1ba4cc3 100644
--- a/config/src/tests/configretriever/CMakeLists.txt
+++ b/config/src/tests/configretriever/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(config_configretriever_test_app
+vespa_add_executable(config_configretriever_test_app TEST
SOURCES
configretriever.cpp
DEPENDS
diff --git a/config/src/tests/configuri/CMakeLists.txt b/config/src/tests/configuri/CMakeLists.txt
index 10fcac86c76..5608efa585d 100644
--- a/config/src/tests/configuri/CMakeLists.txt
+++ b/config/src/tests/configuri/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(config_configuri_test_app
+vespa_add_executable(config_configuri_test_app TEST
SOURCES
configuri_test.cpp
DEPENDS
diff --git a/config/src/tests/failover/CMakeLists.txt b/config/src/tests/failover/CMakeLists.txt
index aa5ab803bc5..d58bf9a3824 100644
--- a/config/src/tests/failover/CMakeLists.txt
+++ b/config/src/tests/failover/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(config_failover_test_app
+vespa_add_executable(config_failover_test_app TEST
SOURCES
failover.cpp
DEPENDS
diff --git a/config/src/tests/file_subscription/CMakeLists.txt b/config/src/tests/file_subscription/CMakeLists.txt
index f582732ffb2..71f12e0a7c6 100644
--- a/config/src/tests/file_subscription/CMakeLists.txt
+++ b/config/src/tests/file_subscription/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(config_file_subscription_test_app
+vespa_add_executable(config_file_subscription_test_app TEST
SOURCES
file_subscription.cpp
DEPENDS
diff --git a/config/src/tests/frt/CMakeLists.txt b/config/src/tests/frt/CMakeLists.txt
index 96f0fbb0076..cffca93c5b2 100644
--- a/config/src/tests/frt/CMakeLists.txt
+++ b/config/src/tests/frt/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(config_frt_test_app
+vespa_add_executable(config_frt_test_app TEST
SOURCES
frt.cpp
DEPENDS
diff --git a/config/src/tests/frtconnectionpool/CMakeLists.txt b/config/src/tests/frtconnectionpool/CMakeLists.txt
index 1979577f5fb..6d21903c357 100644
--- a/config/src/tests/frtconnectionpool/CMakeLists.txt
+++ b/config/src/tests/frtconnectionpool/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(config_frtconnectionpool_test_app
+vespa_add_executable(config_frtconnectionpool_test_app TEST
SOURCES
frtconnectionpool.cpp
DEPENDS
diff --git a/config/src/tests/functiontest/CMakeLists.txt b/config/src/tests/functiontest/CMakeLists.txt
index d798ad53de4..86481532c98 100644
--- a/config/src/tests/functiontest/CMakeLists.txt
+++ b/config/src/tests/functiontest/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(config_functiontest_test_app
+vespa_add_executable(config_functiontest_test_app TEST
SOURCES
functiontest.cpp
DEPENDS
diff --git a/config/src/tests/getconfig/CMakeLists.txt b/config/src/tests/getconfig/CMakeLists.txt
index f8ad5c2c7ed..dc7b9b34b4e 100644
--- a/config/src/tests/getconfig/CMakeLists.txt
+++ b/config/src/tests/getconfig/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(config_getconfig_test_app
+vespa_add_executable(config_getconfig_test_app TEST
SOURCES
getconfig.cpp
DEPENDS
diff --git a/config/src/tests/legacysubscriber/CMakeLists.txt b/config/src/tests/legacysubscriber/CMakeLists.txt
index 66022e31007..28ca227e7b5 100644
--- a/config/src/tests/legacysubscriber/CMakeLists.txt
+++ b/config/src/tests/legacysubscriber/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(config_legacysubscriber_test_app
+vespa_add_executable(config_legacysubscriber_test_app TEST
SOURCES
legacysubscriber.cpp
DEPENDS
diff --git a/config/src/tests/misc/CMakeLists.txt b/config/src/tests/misc/CMakeLists.txt
index a37f6411e0b..928fd41cd36 100644
--- a/config/src/tests/misc/CMakeLists.txt
+++ b/config/src/tests/misc/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(config_misc_test_app
+vespa_add_executable(config_misc_test_app TEST
SOURCES
misc.cpp
DEPENDS
diff --git a/config/src/tests/payload_converter/CMakeLists.txt b/config/src/tests/payload_converter/CMakeLists.txt
index 743486e7164..58017d4a4e5 100644
--- a/config/src/tests/payload_converter/CMakeLists.txt
+++ b/config/src/tests/payload_converter/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(config_payload_converter_test_app
+vespa_add_executable(config_payload_converter_test_app TEST
SOURCES
payload_converter.cpp
DEPENDS
diff --git a/config/src/tests/print/CMakeLists.txt b/config/src/tests/print/CMakeLists.txt
index 7af3b842c50..8472d14babb 100644
--- a/config/src/tests/print/CMakeLists.txt
+++ b/config/src/tests/print/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(config_print_test_app
+vespa_add_executable(config_print_test_app TEST
SOURCES
print.cpp
DEPENDS
diff --git a/config/src/tests/raw_subscription/CMakeLists.txt b/config/src/tests/raw_subscription/CMakeLists.txt
index 8f1431006e0..eb25cf833c3 100644
--- a/config/src/tests/raw_subscription/CMakeLists.txt
+++ b/config/src/tests/raw_subscription/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(config_raw_subscription_test_app
+vespa_add_executable(config_raw_subscription_test_app TEST
SOURCES
raw_subscription.cpp
DEPENDS
diff --git a/config/src/tests/subscriber/CMakeLists.txt b/config/src/tests/subscriber/CMakeLists.txt
index 1b1673a2512..c5840925951 100644
--- a/config/src/tests/subscriber/CMakeLists.txt
+++ b/config/src/tests/subscriber/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(config_subscriber_test_app
+vespa_add_executable(config_subscriber_test_app TEST
SOURCES
subscriber.cpp
DEPENDS
diff --git a/config/src/tests/subscription/CMakeLists.txt b/config/src/tests/subscription/CMakeLists.txt
index bbc3546c1da..0877bf20cfb 100644
--- a/config/src/tests/subscription/CMakeLists.txt
+++ b/config/src/tests/subscription/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(config_subscription_test_app
+vespa_add_executable(config_subscription_test_app TEST
SOURCES
subscription.cpp
DEPENDS
diff --git a/config/src/tests/trace/CMakeLists.txt b/config/src/tests/trace/CMakeLists.txt
index b328f61abdc..3e13b579783 100644
--- a/config/src/tests/trace/CMakeLists.txt
+++ b/config/src/tests/trace/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(config_trace_test_app
+vespa_add_executable(config_trace_test_app TEST
SOURCES
trace.cpp
DEPENDS
diff --git a/config/src/tests/unittest/CMakeLists.txt b/config/src/tests/unittest/CMakeLists.txt
index 9eeb5c761d1..3afdcb0dcb8 100644
--- a/config/src/tests/unittest/CMakeLists.txt
+++ b/config/src/tests/unittest/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(config_unittest_test_app
+vespa_add_executable(config_unittest_test_app TEST
SOURCES
unittest.cpp
DEPENDS
diff --git a/configd/src/tests/messages/CMakeLists.txt b/configd/src/tests/messages/CMakeLists.txt
index fed4f9fe470..400e47e0fe9 100644
--- a/configd/src/tests/messages/CMakeLists.txt
+++ b/configd/src/tests/messages/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(configd_messages_test_app
+vespa_add_executable(configd_messages_test_app TEST
SOURCES
messages.cpp
DEPENDS
diff --git a/configutil/src/tests/config_status/CMakeLists.txt b/configutil/src/tests/config_status/CMakeLists.txt
index 2eda052bfd8..05801a0c5d3 100644
--- a/configutil/src/tests/config_status/CMakeLists.txt
+++ b/configutil/src/tests/config_status/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(configutil_config_status_test_app
+vespa_add_executable(configutil_config_status_test_app TEST
SOURCES
config_status_test.cpp
DEPENDS
diff --git a/configutil/src/tests/model_inspect/CMakeLists.txt b/configutil/src/tests/model_inspect/CMakeLists.txt
index a2890b5ae23..7abd8e69a5b 100644
--- a/configutil/src/tests/model_inspect/CMakeLists.txt
+++ b/configutil/src/tests/model_inspect/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(configutil_model_inspect_test_app
+vespa_add_executable(configutil_model_inspect_test_app TEST
SOURCES
model_inspect_test.cpp
DEPENDS
diff --git a/configutil/src/tests/tags/CMakeLists.txt b/configutil/src/tests/tags/CMakeLists.txt
index 5e43bee2ecc..30ee89de8b5 100644
--- a/configutil/src/tests/tags/CMakeLists.txt
+++ b/configutil/src/tests/tags/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(configutil_tags_test_app
+vespa_add_executable(configutil_tags_test_app TEST
SOURCES
tags_test.cpp
DEPENDS
diff --git a/document/src/tests/CMakeLists.txt b/document/src/tests/CMakeLists.txt
index 95e6b4b9a18..14bbeaa90d0 100644
--- a/document/src/tests/CMakeLists.txt
+++ b/document/src/tests/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(document_testrunner_app
+vespa_add_executable(document_testrunner_app TEST
SOURCES
teststringutil.cpp
testbytebuffer.cpp
diff --git a/document/src/tests/annotation/CMakeLists.txt b/document/src/tests/annotation/CMakeLists.txt
index 1ec6a3e3dde..5ecb7213266 100644
--- a/document/src/tests/annotation/CMakeLists.txt
+++ b/document/src/tests/annotation/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(document_annotation_test_app
+vespa_add_executable(document_annotation_test_app TEST
SOURCES
annotation_test.cpp
DEPENDS
diff --git a/document/src/tests/base/CMakeLists.txt b/document/src/tests/base/CMakeLists.txt
index 550d77d1340..b5099443252 100644
--- a/document/src/tests/base/CMakeLists.txt
+++ b/document/src/tests/base/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(document_documentid_test_app
+vespa_add_executable(document_documentid_test_app TEST
SOURCES
documentid_test.cpp
DEPENDS
diff --git a/document/src/tests/datatype/CMakeLists.txt b/document/src/tests/datatype/CMakeLists.txt
index 399bccdf691..1061b115be9 100644
--- a/document/src/tests/datatype/CMakeLists.txt
+++ b/document/src/tests/datatype/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(document_datatype_test_app
+vespa_add_executable(document_datatype_test_app TEST
SOURCES
datatype_test.cpp
DEPENDS
diff --git a/document/src/tests/fieldvalue/CMakeLists.txt b/document/src/tests/fieldvalue/CMakeLists.txt
index 7b5fc637e4f..c44cca690b7 100644
--- a/document/src/tests/fieldvalue/CMakeLists.txt
+++ b/document/src/tests/fieldvalue/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(document_document_test_app
+vespa_add_executable(document_document_test_app TEST
SOURCES
document_test.cpp
DEPENDS
@@ -8,7 +8,7 @@ vespa_add_executable(document_document_test_app
document_documentconfig
)
vespa_add_test(NAME document_document_test_app COMMAND document_document_test_app)
-vespa_add_executable(document_fieldvalue_test_app
+vespa_add_executable(document_fieldvalue_test_app TEST
SOURCES
fieldvalue_test.cpp
DEPENDS
@@ -17,7 +17,7 @@ vespa_add_executable(document_fieldvalue_test_app
document_documentconfig
)
vespa_add_test(NAME document_fieldvalue_test_app COMMAND document_fieldvalue_test_app)
-vespa_add_executable(document_predicatefieldvalue_test_app
+vespa_add_executable(document_predicatefieldvalue_test_app TEST
SOURCES
predicatefieldvalue_test.cpp
DEPENDS
diff --git a/document/src/tests/predicate/CMakeLists.txt b/document/src/tests/predicate/CMakeLists.txt
index 445da128498..d1181340852 100644
--- a/document/src/tests/predicate/CMakeLists.txt
+++ b/document/src/tests/predicate/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(document_predicate_test_app
+vespa_add_executable(document_predicate_test_app TEST
SOURCES
predicate_test.cpp
DEPENDS
@@ -8,7 +8,7 @@ vespa_add_executable(document_predicate_test_app
document_documentconfig
)
vespa_add_test(NAME document_predicate_test_app COMMAND document_predicate_test_app)
-vespa_add_executable(document_predicate_builder_test_app
+vespa_add_executable(document_predicate_builder_test_app TEST
SOURCES
predicate_builder_test.cpp
DEPENDS
@@ -17,7 +17,7 @@ vespa_add_executable(document_predicate_builder_test_app
document_documentconfig
)
vespa_add_test(NAME document_predicate_builder_test_app COMMAND document_predicate_builder_test_app)
-vespa_add_executable(document_predicate_printer_test_app
+vespa_add_executable(document_predicate_printer_test_app TEST
SOURCES
predicate_printer_test.cpp
DEPENDS
diff --git a/document/src/tests/repo/CMakeLists.txt b/document/src/tests/repo/CMakeLists.txt
index efd74caf954..8b268d1f719 100644
--- a/document/src/tests/repo/CMakeLists.txt
+++ b/document/src/tests/repo/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(document_documenttyperepo_test_app
+vespa_add_executable(document_documenttyperepo_test_app TEST
SOURCES
documenttyperepo_test.cpp
DEPENDS
diff --git a/document/src/tests/serialization/CMakeLists.txt b/document/src/tests/serialization/CMakeLists.txt
index dcbf067e4a5..cd645adf0ad 100644
--- a/document/src/tests/serialization/CMakeLists.txt
+++ b/document/src/tests/serialization/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(document_vespadocumentserializer_test_app
+vespa_add_executable(document_vespadocumentserializer_test_app TEST
SOURCES
vespadocumentserializer_test.cpp
DEPENDS
@@ -8,7 +8,7 @@ vespa_add_executable(document_vespadocumentserializer_test_app
document_documentconfig
)
vespa_add_test(NAME document_vespadocumentserializer_test_app COMMAND document_vespadocumentserializer_test_app)
-vespa_add_executable(document_annotationserializer_test_app
+vespa_add_executable(document_annotationserializer_test_app TEST
SOURCES
annotationserializer_test.cpp
DEPENDS
@@ -17,7 +17,7 @@ vespa_add_executable(document_annotationserializer_test_app
document_documentconfig
)
vespa_add_test(NAME document_annotationserializer_test_app COMMAND document_annotationserializer_test_app)
-vespa_add_executable(document_compression_test_app
+vespa_add_executable(document_compression_test_app TEST
SOURCES
compression_test.cpp
DEPENDS
diff --git a/document/src/tests/struct_anno/CMakeLists.txt b/document/src/tests/struct_anno/CMakeLists.txt
index 64678282842..495d58a4d55 100644
--- a/document/src/tests/struct_anno/CMakeLists.txt
+++ b/document/src/tests/struct_anno/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(document_struct_anno_test_app
+vespa_add_executable(document_struct_anno_test_app TEST
SOURCES
struct_anno_test.cpp
DEPENDS
diff --git a/document/src/tests/tensor_fieldvalue/CMakeLists.txt b/document/src/tests/tensor_fieldvalue/CMakeLists.txt
index d0fa1526bbc..4456d5a0c2b 100644
--- a/document/src/tests/tensor_fieldvalue/CMakeLists.txt
+++ b/document/src/tests/tensor_fieldvalue/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(document_tensor_fieldvalue_test_app
+vespa_add_executable(document_tensor_fieldvalue_test_app TEST
SOURCES
tensor_fieldvalue_test.cpp
DEPENDS
diff --git a/documentapi/src/tests/loadtypes/CMakeLists.txt b/documentapi/src/tests/loadtypes/CMakeLists.txt
index 7c1e92b087f..e75fa7b8e0f 100644
--- a/documentapi/src/tests/loadtypes/CMakeLists.txt
+++ b/documentapi/src/tests/loadtypes/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(documentapi_loadtype_test_app
+vespa_add_executable(documentapi_loadtype_test_app TEST
SOURCES
loadtypetest.cpp
testrunner.cpp
diff --git a/documentapi/src/tests/messagebus/CMakeLists.txt b/documentapi/src/tests/messagebus/CMakeLists.txt
index 0f0760c1b57..de85fedc97e 100644
--- a/documentapi/src/tests/messagebus/CMakeLists.txt
+++ b/documentapi/src/tests/messagebus/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(documentapi_messagebus_test_app
+vespa_add_executable(documentapi_messagebus_test_app TEST
SOURCES
messagebus_test.cpp
DEPENDS
diff --git a/documentapi/src/tests/messages/CMakeLists.txt b/documentapi/src/tests/messages/CMakeLists.txt
index bfffd0d0502..fc7560254a1 100644
--- a/documentapi/src/tests/messages/CMakeLists.txt
+++ b/documentapi/src/tests/messages/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(documentapi_messages50_test_app
+vespa_add_executable(documentapi_messages50_test_app TEST
SOURCES
testbase.cpp
messages50test.cpp
@@ -8,7 +8,7 @@ vespa_add_executable(documentapi_messages50_test_app
documentapi
)
vespa_add_test(NAME documentapi_messages50_test_app COMMAND documentapi_messages50_test_app)
-vespa_add_executable(documentapi_messages51_test_app
+vespa_add_executable(documentapi_messages51_test_app TEST
SOURCES
testbase.cpp
messages50test.cpp
@@ -18,7 +18,7 @@ vespa_add_executable(documentapi_messages51_test_app
documentapi
)
vespa_add_test(NAME documentapi_messages51_test_app COMMAND documentapi_messages51_test_app)
-vespa_add_executable(documentapi_messages52_test_app
+vespa_add_executable(documentapi_messages52_test_app TEST
SOURCES
testbase.cpp
messages50test.cpp
@@ -29,7 +29,7 @@ vespa_add_executable(documentapi_messages52_test_app
documentapi
)
vespa_add_test(NAME documentapi_messages52_test_app COMMAND documentapi_messages52_test_app)
-vespa_add_executable(documentapi_error_codes_test_app_app
+vespa_add_executable(documentapi_error_codes_test_app_app TEST
SOURCES
error_codes_test.cpp
DEPENDS
diff --git a/documentapi/src/tests/policies/CMakeLists.txt b/documentapi/src/tests/policies/CMakeLists.txt
index dcf0f4bef4b..a749997a612 100644
--- a/documentapi/src/tests/policies/CMakeLists.txt
+++ b/documentapi/src/tests/policies/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(documentapi_policies_test_app
+vespa_add_executable(documentapi_policies_test_app TEST
SOURCES
testframe.cpp
policies_test.cpp
diff --git a/documentapi/src/tests/policyfactory/CMakeLists.txt b/documentapi/src/tests/policyfactory/CMakeLists.txt
index c533847ff36..6b8090ec60d 100644
--- a/documentapi/src/tests/policyfactory/CMakeLists.txt
+++ b/documentapi/src/tests/policyfactory/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(documentapi_policyfactory_test_app
+vespa_add_executable(documentapi_policyfactory_test_app TEST
SOURCES
policyfactory.cpp
DEPENDS
diff --git a/documentapi/src/tests/priority/CMakeLists.txt b/documentapi/src/tests/priority/CMakeLists.txt
index 289ea4b4ebe..5e2a35f06a1 100644
--- a/documentapi/src/tests/priority/CMakeLists.txt
+++ b/documentapi/src/tests/priority/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(documentapi_priority_test_app
+vespa_add_executable(documentapi_priority_test_app TEST
SOURCES
priority.cpp
DEPENDS
diff --git a/documentapi/src/tests/replymerger/CMakeLists.txt b/documentapi/src/tests/replymerger/CMakeLists.txt
index 9faa203fb2b..c2267f8d3ff 100644
--- a/documentapi/src/tests/replymerger/CMakeLists.txt
+++ b/documentapi/src/tests/replymerger/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(documentapi_replymerger_test_app
+vespa_add_executable(documentapi_replymerger_test_app TEST
SOURCES
replymerger_test.cpp
DEPENDS
diff --git a/documentapi/src/tests/routablefactory/CMakeLists.txt b/documentapi/src/tests/routablefactory/CMakeLists.txt
index ba6ea53bf8f..0d7179261bc 100644
--- a/documentapi/src/tests/routablefactory/CMakeLists.txt
+++ b/documentapi/src/tests/routablefactory/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(documentapi_routablefactory_test_app
+vespa_add_executable(documentapi_routablefactory_test_app TEST
SOURCES
routablefactory.cpp
DEPENDS
diff --git a/documentapi/src/tests/systemstate/CMakeLists.txt b/documentapi/src/tests/systemstate/CMakeLists.txt
index a1a88c66278..539bd7386cc 100644
--- a/documentapi/src/tests/systemstate/CMakeLists.txt
+++ b/documentapi/src/tests/systemstate/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(documentapi_systemstate_test_app
+vespa_add_executable(documentapi_systemstate_test_app TEST
SOURCES
systemstate.cpp
DEPENDS
diff --git a/fastlib/src/vespa/fastlib/io/tests/CMakeLists.txt b/fastlib/src/vespa/fastlib/io/tests/CMakeLists.txt
index 06705ef1294..29912156b59 100644
--- a/fastlib/src/vespa/fastlib/io/tests/CMakeLists.txt
+++ b/fastlib/src/vespa/fastlib/io/tests/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(fastlib_bufferedstreamtest_app
+vespa_add_executable(fastlib_bufferedstreamtest_app TEST
SOURCES
bufferedstreamtest.cpp
DEPENDS
fastlib_io
)
vespa_add_test(NAME fastlib_bufferedstreamtest_app COMMAND fastlib_bufferedstreamtest_app fastlib_bufferedstreamtest_app)
-vespa_add_executable(fastlib_bufferedfiletest_app
+vespa_add_executable(fastlib_bufferedfiletest_app TEST
SOURCES
bufferedfiletest.cpp
DEPENDS
diff --git a/fastlib/src/vespa/fastlib/net/tests/CMakeLists.txt b/fastlib/src/vespa/fastlib/net/tests/CMakeLists.txt
index bb6bdd420b3..72957df223e 100644
--- a/fastlib/src/vespa/fastlib/net/tests/CMakeLists.txt
+++ b/fastlib/src/vespa/fastlib/net/tests/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(fastlib_httpheaderparsertest_app
+vespa_add_executable(fastlib_httpheaderparsertest_app TEST
SOURCES
httpheaderparsertest.cpp
DEPENDS
diff --git a/fastlib/src/vespa/fastlib/text/tests/CMakeLists.txt b/fastlib/src/vespa/fastlib/text/tests/CMakeLists.txt
index de9bb279126..e0c137151ca 100644
--- a/fastlib/src/vespa/fastlib/text/tests/CMakeLists.txt
+++ b/fastlib/src/vespa/fastlib/text/tests/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(fastlib_unicodeutiltest_app
+vespa_add_executable(fastlib_unicodeutiltest_app TEST
SOURCES
unicodeutiltest.cpp
DEPENDS
fastlib_text
)
vespa_add_test(NAME fastlib_unicodeutiltest_app NO_VALGRIND COMMAND fastlib_unicodeutiltest_app)
-vespa_add_executable(fastlib_latintokenizertest_app
+vespa_add_executable(fastlib_latintokenizertest_app TEST
SOURCES
latintokenizertest.cpp
DEPENDS
fastlib_text
)
vespa_add_test(NAME fastlib_latintokenizertest_app NO_VALGRIND COMMAND fastlib_latintokenizertest_app)
-vespa_add_executable(fastlib_wordfolderstest_app
+vespa_add_executable(fastlib_wordfolderstest_app TEST
SOURCES
wordfolderstest.cpp
DEPENDS
diff --git a/fastlib/src/vespa/fastlib/util/tests/CMakeLists.txt b/fastlib/src/vespa/fastlib/util/tests/CMakeLists.txt
index 8d45ffd58b0..3cd980552fe 100644
--- a/fastlib/src/vespa/fastlib/util/tests/CMakeLists.txt
+++ b/fastlib/src/vespa/fastlib/util/tests/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(fastlib_base64test_app
+vespa_add_executable(fastlib_base64test_app TEST
SOURCES
base64test.cpp
DEPENDS
fastlib_util
)
vespa_add_test(NAME fastlib_base64test_app NO_VALGRIND COMMAND fastlib_base64test_app fastlib_base64test_app)
-vespa_add_executable(fastlib_bagtest_app
+vespa_add_executable(fastlib_bagtest_app TEST
SOURCES
bagtest.cpp
DEPENDS
fastlib_util
)
vespa_add_test(NAME fastlib_bagtest_app NO_VALGRIND COMMAND fastlib_bagtest_app)
-vespa_add_executable(fastlib_wildcard_match_test_app
+vespa_add_executable(fastlib_wildcard_match_test_app TEST
SOURCES
wildcard_match_test.cpp
DEPENDS
diff --git a/fastos/src/tests/CMakeLists.txt b/fastos/src/tests/CMakeLists.txt
index 06e891b88b3..c80dca8c2e1 100644
--- a/fastos/src/tests/CMakeLists.txt
+++ b/fastos/src/tests/CMakeLists.txt
@@ -1,61 +1,61 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(fastos_processtest_app
+vespa_add_executable(fastos_processtest_app TEST
SOURCES
processtest.cpp
DEPENDS
fastos
)
vespa_add_test(NAME fastos_processtest_app NO_VALGRIND COMMAND fastos_processtest_app fastos_processtest_app fastos_usecputest_app)
-vespa_add_executable(fastos_prefetchtest_app
+vespa_add_executable(fastos_prefetchtest_app TEST
SOURCES
prefetchtest.cpp
DEPENDS
fastos
)
vespa_add_test(NAME fastos_prefetchtest_app NO_VALGRIND COMMAND fastos_prefetchtest_app)
-vespa_add_executable(fastos_filetest_app
+vespa_add_executable(fastos_filetest_app TEST
SOURCES
filetest.cpp
DEPENDS
fastos
)
vespa_add_test(NAME fastos_filetest_app NO_VALGRIND COMMAND fastos_filetest_app)
-vespa_add_executable(fastos_sockettest_app
+vespa_add_executable(fastos_sockettest_app TEST
SOURCES
sockettest.cpp
DEPENDS
fastos
)
vespa_add_test(NAME fastos_sockettest_app NO_VALGRIND COMMAND fastos_sockettest_app)
-vespa_add_executable(fastos_threadtest_app
+vespa_add_executable(fastos_threadtest_app TEST
SOURCES
threadtest.cpp
DEPENDS
fastos
)
vespa_add_test(NAME fastos_threadtest_app NO_VALGRIND COMMAND fastos_threadtest_app)
-vespa_add_executable(fastos_backtracetest_app
+vespa_add_executable(fastos_backtracetest_app TEST
SOURCES
backtracetest.cpp
DEPENDS
fastos
)
vespa_add_test(NAME fastos_backtracetest_app NO_VALGRIND COMMAND fastos_backtracetest_app)
-vespa_add_executable(fastos_timetest_app
+vespa_add_executable(fastos_timetest_app TEST
SOURCES
timetest.cpp
DEPENDS
fastos
)
vespa_add_test(NAME fastos_timetest_app NO_VALGRIND COMMAND fastos_timetest_app)
-vespa_add_executable(fastos_typetest_app
+vespa_add_executable(fastos_typetest_app TEST
SOURCES
typetest.cpp
DEPENDS
fastos
)
vespa_add_test(NAME fastos_typetest_app NO_VALGRIND COMMAND fastos_typetest_app)
-vespa_add_executable(fastos_usecputest_app
+vespa_add_executable(fastos_usecputest_app TEST
SOURCES
usecputest.cpp
DEPENDS
diff --git a/fbench/src/test/CMakeLists.txt b/fbench/src/test/CMakeLists.txt
index 2ea472ad8e5..23a95df9dff 100644
--- a/fbench/src/test/CMakeLists.txt
+++ b/fbench/src/test/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(fbench_httpclient_splitstring_app
+vespa_add_executable(fbench_httpclient_splitstring_app TEST
SOURCES
httpclient_splitstring.cpp
DEPENDS
@@ -14,14 +14,14 @@ vespa_add_executable(fbench_httpclient_app
fbench_util
fastos
)
-vespa_add_executable(fbench_filereader_app
+vespa_add_executable(fbench_filereader_app TEST
SOURCES
filereader.cpp
DEPENDS
fbench_util
)
vespa_add_test(NAME fbench_filereader_app COMMAND fbench_filereader_app)
-vespa_add_executable(fbench_clientstatus_app
+vespa_add_executable(fbench_clientstatus_app TEST
SOURCES
clientstatus.cpp
DEPENDS
diff --git a/filedistribution/src/tests/common/CMakeLists.txt b/filedistribution/src/tests/common/CMakeLists.txt
index b9670848fbc..10fae25892c 100644
--- a/filedistribution/src/tests/common/CMakeLists.txt
+++ b/filedistribution/src/tests/common/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(filedistribution_common_test_app
+vespa_add_executable(filedistribution_common_test_app TEST
SOURCES
testCommon.cpp
DEPENDS
diff --git a/filedistribution/src/tests/filedbmodelimpl/CMakeLists.txt b/filedistribution/src/tests/filedbmodelimpl/CMakeLists.txt
index 9bd7bd14ebb..aded3e4f07e 100644
--- a/filedistribution/src/tests/filedbmodelimpl/CMakeLists.txt
+++ b/filedistribution/src/tests/filedbmodelimpl/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(filedistribution_filedbmodelimpl_test_app
+vespa_add_executable(filedistribution_filedbmodelimpl_test_app TEST
SOURCES
test-filedistributionmodelimpl.cpp
DEPENDS
diff --git a/filedistribution/src/tests/filedownloader/CMakeLists.txt b/filedistribution/src/tests/filedownloader/CMakeLists.txt
index 6be9b28651d..31c2f67738d 100644
--- a/filedistribution/src/tests/filedownloader/CMakeLists.txt
+++ b/filedistribution/src/tests/filedownloader/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(filedistribution_filedownloader_test_app
+vespa_add_executable(filedistribution_filedownloader_test_app TEST
SOURCES
testfiledownloader.cpp
DEPENDS
diff --git a/filedistribution/src/tests/rpc/CMakeLists.txt b/filedistribution/src/tests/rpc/CMakeLists.txt
index 9a592c15ab4..faf23f1d464 100644
--- a/filedistribution/src/tests/rpc/CMakeLists.txt
+++ b/filedistribution/src/tests/rpc/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(filedistribution_rpc_test_app
+vespa_add_executable(filedistribution_rpc_test_app TEST
SOURCES
testfileprovider.cpp
DEPENDS
diff --git a/filedistribution/src/tests/scheduler/CMakeLists.txt b/filedistribution/src/tests/scheduler/CMakeLists.txt
index 67b86c3e634..ffc569b480b 100644
--- a/filedistribution/src/tests/scheduler/CMakeLists.txt
+++ b/filedistribution/src/tests/scheduler/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(filedistribution_scheduler_test_app
+vespa_add_executable(filedistribution_scheduler_test_app TEST
SOURCES
test-scheduler.cpp
DEPENDS
diff --git a/filedistribution/src/tests/status/CMakeLists.txt b/filedistribution/src/tests/status/CMakeLists.txt
index 79676c4e811..30037c518ac 100644
--- a/filedistribution/src/tests/status/CMakeLists.txt
+++ b/filedistribution/src/tests/status/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(filedistribution_status_test_app
+vespa_add_executable(filedistribution_status_test_app TEST
SOURCES
test-status.cpp
DEPENDS
diff --git a/filedistribution/src/tests/zkfiledbmodel/CMakeLists.txt b/filedistribution/src/tests/zkfiledbmodel/CMakeLists.txt
index 7b205d009f8..f1ee7ac3e84 100644
--- a/filedistribution/src/tests/zkfiledbmodel/CMakeLists.txt
+++ b/filedistribution/src/tests/zkfiledbmodel/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(filedistribution_zkfiledbmodel_test_app
+vespa_add_executable(filedistribution_zkfiledbmodel_test_app TEST
SOURCES
test-zkfiledbmodel.cpp
DEPENDS
diff --git a/fnet/src/tests/connect_thread/CMakeLists.txt b/fnet/src/tests/connect_thread/CMakeLists.txt
index 535ac5e3561..337ab336a7b 100644
--- a/fnet/src/tests/connect_thread/CMakeLists.txt
+++ b/fnet/src/tests/connect_thread/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(fnet_connect_thread_test_app
+vespa_add_executable(fnet_connect_thread_test_app TEST
SOURCES
connect_thread_test.cpp
DEPENDS
diff --git a/fnet/src/tests/connection_spread/CMakeLists.txt b/fnet/src/tests/connection_spread/CMakeLists.txt
index 9ed541b62e3..6d02e842c9a 100644
--- a/fnet/src/tests/connection_spread/CMakeLists.txt
+++ b/fnet/src/tests/connection_spread/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(fnet_connection_spread_test_app
+vespa_add_executable(fnet_connection_spread_test_app TEST
SOURCES
connection_spread_test.cpp
DEPENDS
diff --git a/fnet/src/tests/databuffer/CMakeLists.txt b/fnet/src/tests/databuffer/CMakeLists.txt
index 47122e11d96..877d39cec60 100644
--- a/fnet/src/tests/databuffer/CMakeLists.txt
+++ b/fnet/src/tests/databuffer/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(fnet_databuffer_test_app
+vespa_add_executable(fnet_databuffer_test_app TEST
SOURCES
databuffer.cpp
DEPENDS
diff --git a/fnet/src/tests/examples/CMakeLists.txt b/fnet/src/tests/examples/CMakeLists.txt
index 79f9047f626..fed462f8115 100644
--- a/fnet/src/tests/examples/CMakeLists.txt
+++ b/fnet/src/tests/examples/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(fnet_examples_test_app
+vespa_add_executable(fnet_examples_test_app TEST
SOURCES
examples_test.cpp
DEPENDS
diff --git a/fnet/src/tests/fdselector/CMakeLists.txt b/fnet/src/tests/fdselector/CMakeLists.txt
index 149d3642983..578d2f4a10e 100644
--- a/fnet/src/tests/fdselector/CMakeLists.txt
+++ b/fnet/src/tests/fdselector/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(fnet_fdselector_test_app
+vespa_add_executable(fnet_fdselector_test_app TEST
SOURCES
fdselector.cpp
DEPENDS
diff --git a/fnet/src/tests/frt/memorytub/CMakeLists.txt b/fnet/src/tests/frt/memorytub/CMakeLists.txt
index 1b6aa6e778b..e33dc154212 100644
--- a/fnet/src/tests/frt/memorytub/CMakeLists.txt
+++ b/fnet/src/tests/frt/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(fnet_memorytub_test_app
+vespa_add_executable(fnet_memorytub_test_app TEST
SOURCES
memorytub.cpp
DEPENDS
diff --git a/fnet/src/tests/frt/method_pt/CMakeLists.txt b/fnet/src/tests/frt/method_pt/CMakeLists.txt
index d5a9566dbba..6de4a51b0c9 100644
--- a/fnet/src/tests/frt/method_pt/CMakeLists.txt
+++ b/fnet/src/tests/frt/method_pt/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(fnet_method_pt_test_app
+vespa_add_executable(fnet_method_pt_test_app TEST
SOURCES
method_pt.cpp
DEPENDS
diff --git a/fnet/src/tests/frt/parallel_rpc/CMakeLists.txt b/fnet/src/tests/frt/parallel_rpc/CMakeLists.txt
index 00a0c12e413..d61fffcd8db 100644
--- a/fnet/src/tests/frt/parallel_rpc/CMakeLists.txt
+++ b/fnet/src/tests/frt/parallel_rpc/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(fnet_parallel_rpc_test_app
+vespa_add_executable(fnet_parallel_rpc_test_app TEST
SOURCES
parallel_rpc_test.cpp
DEPENDS
diff --git a/fnet/src/tests/frt/rpc/CMakeLists.txt b/fnet/src/tests/frt/rpc/CMakeLists.txt
index 806a78ec6b7..8cd50f13910 100644
--- a/fnet/src/tests/frt/rpc/CMakeLists.txt
+++ b/fnet/src/tests/frt/rpc/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(fnet_invoke_test_app
+vespa_add_executable(fnet_invoke_test_app TEST
SOURCES
invoke.cpp
DEPENDS
fnet
)
vespa_add_test(NAME fnet_invoke_test_app COMMAND fnet_invoke_test_app)
-vespa_add_executable(fnet_detach_return_invoke_test_app
+vespa_add_executable(fnet_detach_return_invoke_test_app TEST
SOURCES
detach_return_invoke.cpp
DEPENDS
fnet
)
vespa_add_test(NAME fnet_detach_return_invoke_test_app COMMAND fnet_detach_return_invoke_test_app)
-vespa_add_executable(fnet_session_test_app
+vespa_add_executable(fnet_session_test_app TEST
SOURCES
session.cpp
DEPENDS
fnet
)
vespa_add_test(NAME fnet_session_test_app COMMAND fnet_session_test_app)
-vespa_add_executable(fnet_sharedblob_test_app
+vespa_add_executable(fnet_sharedblob_test_app TEST
SOURCES
sharedblob.cpp
DEPENDS
diff --git a/fnet/src/tests/frt/values/CMakeLists.txt b/fnet/src/tests/frt/values/CMakeLists.txt
index f1a851a09b1..f2f2f3dd915 100644
--- a/fnet/src/tests/frt/values/CMakeLists.txt
+++ b/fnet/src/tests/frt/values/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(fnet_values_test_app
+vespa_add_executable(fnet_values_test_app TEST
SOURCES
values_test.cpp
DEPENDS
diff --git a/fnet/src/tests/info/CMakeLists.txt b/fnet/src/tests/info/CMakeLists.txt
index fb6069e5f8a..4825617605b 100644
--- a/fnet/src/tests/info/CMakeLists.txt
+++ b/fnet/src/tests/info/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(fnet_info_test_app
+vespa_add_executable(fnet_info_test_app TEST
SOURCES
info.cpp
DEPENDS
diff --git a/fnet/src/tests/locking/CMakeLists.txt b/fnet/src/tests/locking/CMakeLists.txt
index 7a0187717e6..21a48376b1c 100644
--- a/fnet/src/tests/locking/CMakeLists.txt
+++ b/fnet/src/tests/locking/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(fnet_drainpackets_test_app
+vespa_add_executable(fnet_drainpackets_test_app TEST
SOURCES
drainpackets.cpp
DEPENDS
fnet
)
vespa_add_test(NAME fnet_drainpackets_test_app NO_VALGRIND COMMAND fnet_drainpackets_test_app)
-vespa_add_executable(fnet_lockspeed_test_app
+vespa_add_executable(fnet_lockspeed_test_app TEST
SOURCES
lockspeed.cpp
dummy.cpp
@@ -14,7 +14,7 @@ vespa_add_executable(fnet_lockspeed_test_app
fnet
)
vespa_add_test(NAME fnet_lockspeed_test_app NO_VALGRIND COMMAND fnet_lockspeed_test_app)
-vespa_add_executable(fnet_castspeed_test_app
+vespa_add_executable(fnet_castspeed_test_app TEST
SOURCES
castspeed.cpp
DEPENDS
diff --git a/fnet/src/tests/printstuff/CMakeLists.txt b/fnet/src/tests/printstuff/CMakeLists.txt
index 7180d2866f0..75aa822120f 100644
--- a/fnet/src/tests/printstuff/CMakeLists.txt
+++ b/fnet/src/tests/printstuff/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(fnet_printstuff_test_app
+vespa_add_executable(fnet_printstuff_test_app TEST
SOURCES
printstuff_test.cpp
DEPENDS
diff --git a/fnet/src/tests/scheduling/CMakeLists.txt b/fnet/src/tests/scheduling/CMakeLists.txt
index 244211a7cb6..17a2d00da4c 100644
--- a/fnet/src/tests/scheduling/CMakeLists.txt
+++ b/fnet/src/tests/scheduling/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(fnet_schedule_test_app
+vespa_add_executable(fnet_schedule_test_app TEST
SOURCES
schedule.cpp
DEPENDS
fnet
)
vespa_add_test(NAME fnet_schedule_test_app COMMAND fnet_schedule_test_app)
-vespa_add_executable(fnet_sloweventloop_test_app
+vespa_add_executable(fnet_sloweventloop_test_app TEST
SOURCES
sloweventloop.cpp
DEPENDS
diff --git a/fnet/src/tests/sync_execute/CMakeLists.txt b/fnet/src/tests/sync_execute/CMakeLists.txt
index 820cdb1af86..127d04fc456 100644
--- a/fnet/src/tests/sync_execute/CMakeLists.txt
+++ b/fnet/src/tests/sync_execute/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(fnet_sync_execute_test_app
+vespa_add_executable(fnet_sync_execute_test_app TEST
SOURCES
sync_execute.cpp
DEPENDS
diff --git a/fnet/src/tests/thread_selection/CMakeLists.txt b/fnet/src/tests/thread_selection/CMakeLists.txt
index 183781f3b21..3f8dd642834 100644
--- a/fnet/src/tests/thread_selection/CMakeLists.txt
+++ b/fnet/src/tests/thread_selection/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(fnet_thread_selection_test_app
+vespa_add_executable(fnet_thread_selection_test_app TEST
SOURCES
thread_selection_test.cpp
DEPENDS
diff --git a/fnet/src/tests/time/CMakeLists.txt b/fnet/src/tests/time/CMakeLists.txt
index 5f620af2b53..a2ff8431c4e 100644
--- a/fnet/src/tests/time/CMakeLists.txt
+++ b/fnet/src/tests/time/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(fnet_timespeed_test_app
+vespa_add_executable(fnet_timespeed_test_app TEST
SOURCES
timespeed.cpp
DEPENDS
diff --git a/fsa/src/alltest/CMakeLists.txt b/fsa/src/alltest/CMakeLists.txt
index d82ca400405..a2d99497499 100644
--- a/fsa/src/alltest/CMakeLists.txt
+++ b/fsa/src/alltest/CMakeLists.txt
@@ -61,7 +61,7 @@ vespa_add_executable(fsa_vectorizer_test_app
DEPENDS
fsa
)
-vespa_add_executable(fsa_vectorizer_perf_test_app
+vespa_add_executable(fsa_vectorizer_perf_test_app TEST
SOURCES
vectorizer_perftest.cpp
DEPENDS
diff --git a/functions.cmake b/functions.cmake
index c75a454923b..46b8083b94c 100644
--- a/functions.cmake
+++ b/functions.cmake
@@ -192,7 +192,7 @@ endfunction()
function(vespa_add_executable TARGET)
cmake_parse_arguments(ARG
- ""
+ "TEST"
"INSTALL;OUTPUT_NAME"
"DEPENDS;AFTER;SOURCES"
${ARGN})
@@ -201,6 +201,16 @@ function(vespa_add_executable TARGET)
add_executable(${TARGET} ${ARG_SOURCES})
__add_dependencies_to_target()
+ # If this is a test executable, add it to the test target for this module
+ # If building of unit tests is not specified, exclude this target from the all target
+ if(ARG_TEST)
+ __add_test_target_to_module(${TARGET})
+
+ if(EXCLUDE_TESTS_FROM_ALL)
+ set_target_properties(${TARGET} PROPERTIES EXCLUDE_FROM_ALL TRUE)
+ endif()
+ endif()
+
if(ARG_INSTALL)
install(TARGETS ${TARGET} DESTINATION ${ARG_INSTALL})
endif()
@@ -344,13 +354,6 @@ function(vespa_add_test)
separate_arguments(ARG_COMMAND)
endif()
- # If there exists a target with the same name as the test, exclude the target from the "all" target
- # Instead, add it to the test target for this module
- if (TARGET ${ARG_NAME})
- set_target_properties(${ARG_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE)
- __add_test_target_to_module(${ARG_NAME})
- endif()
-
add_test(NAME ${ARG_NAME} COMMAND ${ARG_COMMAND} WORKING_DIRECTORY ${ARG_WORKING_DIRECTORY})
if(ARG_ENVIRONMENT)
diff --git a/jrt_test/src/tests/echo/CMakeLists.txt b/jrt_test/src/tests/echo/CMakeLists.txt
index 3ac6183a27d..bab581e1606 100644
--- a/jrt_test/src/tests/echo/CMakeLists.txt
+++ b/jrt_test/src/tests/echo/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(jrt_test_echo-client_app
+vespa_add_executable(jrt_test_echo-client_app TEST
SOURCES
echo-client.cpp
DEPENDS
diff --git a/jrt_test/src/tests/mandatory-methods/CMakeLists.txt b/jrt_test/src/tests/mandatory-methods/CMakeLists.txt
index f4496d86cbb..561f19e5912 100644
--- a/jrt_test/src/tests/mandatory-methods/CMakeLists.txt
+++ b/jrt_test/src/tests/mandatory-methods/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(jrt_test_extract-reflection_app
+vespa_add_executable(jrt_test_extract-reflection_app TEST
SOURCES
extract-reflection.cpp
DEPENDS
diff --git a/jrt_test/src/tests/mockup-invoke/CMakeLists.txt b/jrt_test/src/tests/mockup-invoke/CMakeLists.txt
index 773de6f4283..049b42a7e16 100644
--- a/jrt_test/src/tests/mockup-invoke/CMakeLists.txt
+++ b/jrt_test/src/tests/mockup-invoke/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(jrt_test_mockup-server_app
+vespa_add_executable(jrt_test_mockup-server_app TEST
SOURCES
mockup-server.cpp
DEPENDS
diff --git a/jrt_test/src/tests/rpc-error/CMakeLists.txt b/jrt_test/src/tests/rpc-error/CMakeLists.txt
index 9d144709dfc..f4756f3dffa 100644
--- a/jrt_test/src/tests/rpc-error/CMakeLists.txt
+++ b/jrt_test/src/tests/rpc-error/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(jrt_test_test-errors_app
+vespa_add_executable(jrt_test_test-errors_app TEST
SOURCES
test-errors.cpp
DEPENDS
diff --git a/juniper/src/test/CMakeLists.txt b/juniper/src/test/CMakeLists.txt
index 285e705f42b..d574c068c38 100644
--- a/juniper/src/test/CMakeLists.txt
+++ b/juniper/src/test/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(juniper_mcandTest_app
+vespa_add_executable(juniper_mcandTest_app TEST
SOURCES
mcandTest.cpp
mcandTestApp.cpp
@@ -8,7 +8,7 @@ vespa_add_executable(juniper_mcandTest_app
juniper
)
vespa_add_test(NAME juniper_mcandTest_app COMMAND juniper_mcandTest_app)
-vespa_add_executable(juniper_queryparserTest_app
+vespa_add_executable(juniper_queryparserTest_app TEST
SOURCES
queryparserTest.cpp
queryparserTestApp.cpp
@@ -18,7 +18,7 @@ vespa_add_executable(juniper_queryparserTest_app
juniper
)
vespa_add_test(NAME juniper_queryparserTest_app COMMAND juniper_queryparserTest_app)
-vespa_add_executable(juniper_matchobjectTest_app
+vespa_add_executable(juniper_matchobjectTest_app TEST
SOURCES
matchobjectTest.cpp
matchobjectTestApp.cpp
@@ -28,21 +28,21 @@ vespa_add_executable(juniper_matchobjectTest_app
juniper
)
vespa_add_test(NAME juniper_matchobjectTest_app COMMAND juniper_matchobjectTest_app)
-vespa_add_executable(juniper_appender_test_app
+vespa_add_executable(juniper_appender_test_app TEST
SOURCES
appender_test.cpp
DEPENDS
juniper
)
vespa_add_test(NAME juniper_appender_test_app COMMAND juniper_appender_test_app)
-vespa_add_executable(juniper_queryvisitor_test_app
+vespa_add_executable(juniper_queryvisitor_test_app TEST
SOURCES
queryvisitor_test.cpp
DEPENDS
juniper
)
vespa_add_test(NAME juniper_queryvisitor_test_app COMMAND juniper_queryvisitor_test_app)
-vespa_add_executable(juniper_auxTest_app
+vespa_add_executable(juniper_auxTest_app TEST
SOURCES
auxTest.cpp
auxTestApp.cpp
@@ -51,7 +51,7 @@ vespa_add_executable(juniper_auxTest_app
juniper
)
vespa_add_test(NAME juniper_auxTest_app COMMAND juniper_auxTest_app)
-vespa_add_executable(juniper_SrcTestSuite_app
+vespa_add_executable(juniper_SrcTestSuite_app TEST
SOURCES
mcandTest.cpp
queryparserTest.cpp
diff --git a/logd/src/tests/forward/CMakeLists.txt b/logd/src/tests/forward/CMakeLists.txt
index c71b8d89c6e..653fa145522 100644
--- a/logd/src/tests/forward/CMakeLists.txt
+++ b/logd/src/tests/forward/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(logd_forward_test_app
+vespa_add_executable(logd_forward_test_app TEST
SOURCES
forward.cpp
DEPENDS
diff --git a/logd/src/tests/info/CMakeLists.txt b/logd/src/tests/info/CMakeLists.txt
index 3be1ab3cb49..b82292dd9d4 100644
--- a/logd/src/tests/info/CMakeLists.txt
+++ b/logd/src/tests/info/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(logd_info_test_app
+vespa_add_executable(logd_info_test_app TEST
SOURCES
info.cpp
DEPENDS
diff --git a/lowercasing_test/src/tests/hello-world/CMakeLists.txt b/lowercasing_test/src/tests/hello-world/CMakeLists.txt
index ec4d0c68532..079fbe85d71 100644
--- a/lowercasing_test/src/tests/hello-world/CMakeLists.txt
+++ b/lowercasing_test/src/tests/hello-world/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(lowercasing_test_hello-world-local_app
+vespa_add_executable(lowercasing_test_hello-world-local_app TEST
SOURCES
hello-world-local.cpp
DEPENDS
diff --git a/lowercasing_test/src/tests/lowercasing/CMakeLists.txt b/lowercasing_test/src/tests/lowercasing/CMakeLists.txt
index 02bc9f3db52..cfcc932a35a 100644
--- a/lowercasing_test/src/tests/lowercasing/CMakeLists.txt
+++ b/lowercasing_test/src/tests/lowercasing/CMakeLists.txt
@@ -1,11 +1,11 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(lowercasing_test_casingvariants_fastlib_app
+vespa_add_executable(lowercasing_test_casingvariants_fastlib_app TEST
SOURCES
casingvariants_fastlib.cpp
DEPENDS
)
vespa_add_test(NAME lowercasing_test_lowrcasing NO_VALGRIND COMMAND sh lowercasing_test.sh)
-vespa_add_executable(lowercasing_test_casingvariants_vespalib_app
+vespa_add_executable(lowercasing_test_casingvariants_vespalib_app TEST
SOURCES
casingvariants_vespalib.cpp
DEPENDS
diff --git a/memfilepersistence/src/tests/CMakeLists.txt b/memfilepersistence/src/tests/CMakeLists.txt
index ee0cea9e1a5..24863d6e837 100644
--- a/memfilepersistence/src/tests/CMakeLists.txt
+++ b/memfilepersistence/src/tests/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(memfilepersistence_testrunner_app
+vespa_add_executable(memfilepersistence_testrunner_app TEST
SOURCES
testhelper.cpp
testrunner.cpp
diff --git a/messagebus/src/tests/advancedrouting/CMakeLists.txt b/messagebus/src/tests/advancedrouting/CMakeLists.txt
index 99f5b037b69..c51be60518d 100644
--- a/messagebus/src/tests/advancedrouting/CMakeLists.txt
+++ b/messagebus/src/tests/advancedrouting/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(messagebus_advancedrouting_test_app
+vespa_add_executable(messagebus_advancedrouting_test_app TEST
SOURCES
advancedrouting.cpp
DEPENDS
diff --git a/messagebus/src/tests/auto-reply/CMakeLists.txt b/messagebus/src/tests/auto-reply/CMakeLists.txt
index 950ade550b7..46037f7844a 100644
--- a/messagebus/src/tests/auto-reply/CMakeLists.txt
+++ b/messagebus/src/tests/auto-reply/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(messagebus_auto-reply_test_app
+vespa_add_executable(messagebus_auto-reply_test_app TEST
SOURCES
auto-reply.cpp
DEPENDS
diff --git a/messagebus/src/tests/blob/CMakeLists.txt b/messagebus/src/tests/blob/CMakeLists.txt
index d9a865519cb..268b3ee40c3 100644
--- a/messagebus/src/tests/blob/CMakeLists.txt
+++ b/messagebus/src/tests/blob/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(messagebus_blob_test_app
+vespa_add_executable(messagebus_blob_test_app TEST
SOURCES
blob.cpp
DEPENDS
diff --git a/messagebus/src/tests/bucketsequence/CMakeLists.txt b/messagebus/src/tests/bucketsequence/CMakeLists.txt
index 5ab01524d51..35d46d95802 100644
--- a/messagebus/src/tests/bucketsequence/CMakeLists.txt
+++ b/messagebus/src/tests/bucketsequence/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(messagebus_bucketsequence_test_app
+vespa_add_executable(messagebus_bucketsequence_test_app TEST
SOURCES
bucketsequence.cpp
DEPENDS
diff --git a/messagebus/src/tests/choke/CMakeLists.txt b/messagebus/src/tests/choke/CMakeLists.txt
index 02e2c14b943..cb500c48be4 100644
--- a/messagebus/src/tests/choke/CMakeLists.txt
+++ b/messagebus/src/tests/choke/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(messagebus_choke_test_app
+vespa_add_executable(messagebus_choke_test_app TEST
SOURCES
choke.cpp
DEPENDS
diff --git a/messagebus/src/tests/configagent/CMakeLists.txt b/messagebus/src/tests/configagent/CMakeLists.txt
index 04170cc9d05..844371986fd 100644
--- a/messagebus/src/tests/configagent/CMakeLists.txt
+++ b/messagebus/src/tests/configagent/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(messagebus_configagent_test_app
+vespa_add_executable(messagebus_configagent_test_app TEST
SOURCES
configagent.cpp
DEPENDS
diff --git a/messagebus/src/tests/context/CMakeLists.txt b/messagebus/src/tests/context/CMakeLists.txt
index d9a85a1b8c9..bd4705b7a28 100644
--- a/messagebus/src/tests/context/CMakeLists.txt
+++ b/messagebus/src/tests/context/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(messagebus_context_test_app
+vespa_add_executable(messagebus_context_test_app TEST
SOURCES
context.cpp
DEPENDS
diff --git a/messagebus/src/tests/emptyreply/CMakeLists.txt b/messagebus/src/tests/emptyreply/CMakeLists.txt
index 17f26719396..832e761c7fc 100644
--- a/messagebus/src/tests/emptyreply/CMakeLists.txt
+++ b/messagebus/src/tests/emptyreply/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(messagebus_emptyreply_test_app
+vespa_add_executable(messagebus_emptyreply_test_app TEST
SOURCES
emptyreply.cpp
DEPENDS
diff --git a/messagebus/src/tests/error/CMakeLists.txt b/messagebus/src/tests/error/CMakeLists.txt
index 7a5ea78fab3..65d5c69f189 100644
--- a/messagebus/src/tests/error/CMakeLists.txt
+++ b/messagebus/src/tests/error/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(messagebus_error_test_app
+vespa_add_executable(messagebus_error_test_app TEST
SOURCES
error.cpp
DEPENDS
diff --git a/messagebus/src/tests/identity/CMakeLists.txt b/messagebus/src/tests/identity/CMakeLists.txt
index 66aea485746..7090b5e6365 100644
--- a/messagebus/src/tests/identity/CMakeLists.txt
+++ b/messagebus/src/tests/identity/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(messagebus_identity_test_app
+vespa_add_executable(messagebus_identity_test_app TEST
SOURCES
identity.cpp
DEPENDS
diff --git a/messagebus/src/tests/loadbalance/CMakeLists.txt b/messagebus/src/tests/loadbalance/CMakeLists.txt
index 68d0483ce5d..67e67df3719 100644
--- a/messagebus/src/tests/loadbalance/CMakeLists.txt
+++ b/messagebus/src/tests/loadbalance/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(messagebus_loadbalance_test_app
+vespa_add_executable(messagebus_loadbalance_test_app TEST
SOURCES
loadbalance.cpp
DEPENDS
diff --git a/messagebus/src/tests/messagebus/CMakeLists.txt b/messagebus/src/tests/messagebus/CMakeLists.txt
index fc44bb60069..bb0b555d563 100644
--- a/messagebus/src/tests/messagebus/CMakeLists.txt
+++ b/messagebus/src/tests/messagebus/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(messagebus_messagebus_test_app
+vespa_add_executable(messagebus_messagebus_test_app TEST
SOURCES
messagebus.cpp
DEPENDS
diff --git a/messagebus/src/tests/messageordering/CMakeLists.txt b/messagebus/src/tests/messageordering/CMakeLists.txt
index b3af6386684..b92926a8dd8 100644
--- a/messagebus/src/tests/messageordering/CMakeLists.txt
+++ b/messagebus/src/tests/messageordering/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(messagebus_messageordering_test_app
+vespa_add_executable(messagebus_messageordering_test_app TEST
SOURCES
messageordering.cpp
DEPENDS
diff --git a/messagebus/src/tests/messenger/CMakeLists.txt b/messagebus/src/tests/messenger/CMakeLists.txt
index 6dfab750bf4..11b29190483 100644
--- a/messagebus/src/tests/messenger/CMakeLists.txt
+++ b/messagebus/src/tests/messenger/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(messagebus_messenger_test_app
+vespa_add_executable(messagebus_messenger_test_app TEST
SOURCES
messenger.cpp
DEPENDS
diff --git a/messagebus/src/tests/oos/CMakeLists.txt b/messagebus/src/tests/oos/CMakeLists.txt
index 1d037ef6f6e..09819d27fff 100644
--- a/messagebus/src/tests/oos/CMakeLists.txt
+++ b/messagebus/src/tests/oos/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(messagebus_oos_test_app
+vespa_add_executable(messagebus_oos_test_app TEST
SOURCES
oos.cpp
DEPENDS
diff --git a/messagebus/src/tests/protocolrepository/CMakeLists.txt b/messagebus/src/tests/protocolrepository/CMakeLists.txt
index 68156e5eee9..c2968e67c94 100644
--- a/messagebus/src/tests/protocolrepository/CMakeLists.txt
+++ b/messagebus/src/tests/protocolrepository/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(messagebus_protocolrepository_test_app
+vespa_add_executable(messagebus_protocolrepository_test_app TEST
SOURCES
protocolrepository.cpp
DEPENDS
diff --git a/messagebus/src/tests/queue/CMakeLists.txt b/messagebus/src/tests/queue/CMakeLists.txt
index c330421ac8a..77080ec9043 100644
--- a/messagebus/src/tests/queue/CMakeLists.txt
+++ b/messagebus/src/tests/queue/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(messagebus_queue_test_app
+vespa_add_executable(messagebus_queue_test_app TEST
SOURCES
queue.cpp
DEPENDS
diff --git a/messagebus/src/tests/replygate/CMakeLists.txt b/messagebus/src/tests/replygate/CMakeLists.txt
index 8844ef862dd..b2c87d5c405 100644
--- a/messagebus/src/tests/replygate/CMakeLists.txt
+++ b/messagebus/src/tests/replygate/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(messagebus_replygate_test_app
+vespa_add_executable(messagebus_replygate_test_app TEST
SOURCES
replygate.cpp
DEPENDS
diff --git a/messagebus/src/tests/resender/CMakeLists.txt b/messagebus/src/tests/resender/CMakeLists.txt
index b253e582af8..19a0a600301 100644
--- a/messagebus/src/tests/resender/CMakeLists.txt
+++ b/messagebus/src/tests/resender/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(messagebus_resender_test_app
+vespa_add_executable(messagebus_resender_test_app TEST
SOURCES
resender.cpp
DEPENDS
diff --git a/messagebus/src/tests/result/CMakeLists.txt b/messagebus/src/tests/result/CMakeLists.txt
index bd1ed96ab5f..c58966ad983 100644
--- a/messagebus/src/tests/result/CMakeLists.txt
+++ b/messagebus/src/tests/result/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(messagebus_result_test_app
+vespa_add_executable(messagebus_result_test_app TEST
SOURCES
result.cpp
DEPENDS
diff --git a/messagebus/src/tests/retrypolicy/CMakeLists.txt b/messagebus/src/tests/retrypolicy/CMakeLists.txt
index 2a2a2a20e6e..221ad583f08 100644
--- a/messagebus/src/tests/retrypolicy/CMakeLists.txt
+++ b/messagebus/src/tests/retrypolicy/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(messagebus_retrypolicy_test_app
+vespa_add_executable(messagebus_retrypolicy_test_app TEST
SOURCES
retrypolicy.cpp
DEPENDS
diff --git a/messagebus/src/tests/routable/CMakeLists.txt b/messagebus/src/tests/routable/CMakeLists.txt
index d44eca1dc71..632c90105a7 100644
--- a/messagebus/src/tests/routable/CMakeLists.txt
+++ b/messagebus/src/tests/routable/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(messagebus_routable_test_app
+vespa_add_executable(messagebus_routable_test_app TEST
SOURCES
routable.cpp
DEPENDS
diff --git a/messagebus/src/tests/routablequeue/CMakeLists.txt b/messagebus/src/tests/routablequeue/CMakeLists.txt
index 18e2be0a748..a8963a6c920 100644
--- a/messagebus/src/tests/routablequeue/CMakeLists.txt
+++ b/messagebus/src/tests/routablequeue/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(messagebus_routablequeue_test_app
+vespa_add_executable(messagebus_routablequeue_test_app TEST
SOURCES
routablequeue.cpp
DEPENDS
diff --git a/messagebus/src/tests/routeparser/CMakeLists.txt b/messagebus/src/tests/routeparser/CMakeLists.txt
index 712672c6b20..9c16f52fba0 100644
--- a/messagebus/src/tests/routeparser/CMakeLists.txt
+++ b/messagebus/src/tests/routeparser/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(messagebus_routeparser_test_app
+vespa_add_executable(messagebus_routeparser_test_app TEST
SOURCES
routeparser.cpp
DEPENDS
diff --git a/messagebus/src/tests/routing/CMakeLists.txt b/messagebus/src/tests/routing/CMakeLists.txt
index c2b38e4c4b4..01f245c5ffb 100644
--- a/messagebus/src/tests/routing/CMakeLists.txt
+++ b/messagebus/src/tests/routing/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(messagebus_routing_test_app
+vespa_add_executable(messagebus_routing_test_app TEST
SOURCES
routing.cpp
DEPENDS
diff --git a/messagebus/src/tests/routingcontext/CMakeLists.txt b/messagebus/src/tests/routingcontext/CMakeLists.txt
index 064487d2d71..a5c57ed0eba 100644
--- a/messagebus/src/tests/routingcontext/CMakeLists.txt
+++ b/messagebus/src/tests/routingcontext/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(messagebus_routingcontext_test_app
+vespa_add_executable(messagebus_routingcontext_test_app TEST
SOURCES
routingcontext.cpp
DEPENDS
diff --git a/messagebus/src/tests/routingspec/CMakeLists.txt b/messagebus/src/tests/routingspec/CMakeLists.txt
index 43539e07af5..e0d5108c95e 100644
--- a/messagebus/src/tests/routingspec/CMakeLists.txt
+++ b/messagebus/src/tests/routingspec/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(messagebus_routingspec_test_app
+vespa_add_executable(messagebus_routingspec_test_app TEST
SOURCES
routingspec.cpp
DEPENDS
diff --git a/messagebus/src/tests/rpcserviceaddress/CMakeLists.txt b/messagebus/src/tests/rpcserviceaddress/CMakeLists.txt
index e4ada1c8c1b..ad83a43e7c0 100644
--- a/messagebus/src/tests/rpcserviceaddress/CMakeLists.txt
+++ b/messagebus/src/tests/rpcserviceaddress/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(messagebus_rpcserviceaddress_test_app
+vespa_add_executable(messagebus_rpcserviceaddress_test_app TEST
SOURCES
rpcserviceaddress.cpp
DEPENDS
diff --git a/messagebus/src/tests/sendadapter/CMakeLists.txt b/messagebus/src/tests/sendadapter/CMakeLists.txt
index 32c41b40c3c..91d5232d2bc 100644
--- a/messagebus/src/tests/sendadapter/CMakeLists.txt
+++ b/messagebus/src/tests/sendadapter/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(messagebus_sendadapter_test_app
+vespa_add_executable(messagebus_sendadapter_test_app TEST
SOURCES
sendadapter.cpp
DEPENDS
diff --git a/messagebus/src/tests/sequencer/CMakeLists.txt b/messagebus/src/tests/sequencer/CMakeLists.txt
index dab54431722..be647934904 100644
--- a/messagebus/src/tests/sequencer/CMakeLists.txt
+++ b/messagebus/src/tests/sequencer/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(messagebus_sequencer_test_app
+vespa_add_executable(messagebus_sequencer_test_app TEST
SOURCES
sequencer.cpp
DEPENDS
diff --git a/messagebus/src/tests/serviceaddress/CMakeLists.txt b/messagebus/src/tests/serviceaddress/CMakeLists.txt
index 630e28dc94f..67f290585c9 100644
--- a/messagebus/src/tests/serviceaddress/CMakeLists.txt
+++ b/messagebus/src/tests/serviceaddress/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(messagebus_serviceaddress_test_app
+vespa_add_executable(messagebus_serviceaddress_test_app TEST
SOURCES
serviceaddress.cpp
DEPENDS
diff --git a/messagebus/src/tests/servicepool/CMakeLists.txt b/messagebus/src/tests/servicepool/CMakeLists.txt
index 0d6cbc54862..3453326250d 100644
--- a/messagebus/src/tests/servicepool/CMakeLists.txt
+++ b/messagebus/src/tests/servicepool/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(messagebus_servicepool_test_app
+vespa_add_executable(messagebus_servicepool_test_app TEST
SOURCES
servicepool.cpp
DEPENDS
diff --git a/messagebus/src/tests/shutdown/CMakeLists.txt b/messagebus/src/tests/shutdown/CMakeLists.txt
index 69c849ae5fb..f759a988f6f 100644
--- a/messagebus/src/tests/shutdown/CMakeLists.txt
+++ b/messagebus/src/tests/shutdown/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(messagebus_shutdown_test_app
+vespa_add_executable(messagebus_shutdown_test_app TEST
SOURCES
shutdown.cpp
DEPENDS
diff --git a/messagebus/src/tests/simple-roundtrip/CMakeLists.txt b/messagebus/src/tests/simple-roundtrip/CMakeLists.txt
index dff6ebf3e55..bd64d2d2274 100644
--- a/messagebus/src/tests/simple-roundtrip/CMakeLists.txt
+++ b/messagebus/src/tests/simple-roundtrip/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(messagebus_simple-roundtrip_test_app
+vespa_add_executable(messagebus_simple-roundtrip_test_app TEST
SOURCES
simple-roundtrip.cpp
DEPENDS
diff --git a/messagebus/src/tests/simpleprotocol/CMakeLists.txt b/messagebus/src/tests/simpleprotocol/CMakeLists.txt
index 4b4e777ea57..8ad20f8587c 100644
--- a/messagebus/src/tests/simpleprotocol/CMakeLists.txt
+++ b/messagebus/src/tests/simpleprotocol/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(messagebus_simpleprotocol_test_app
+vespa_add_executable(messagebus_simpleprotocol_test_app TEST
SOURCES
simpleprotocol.cpp
DEPENDS
diff --git a/messagebus/src/tests/slobrok/CMakeLists.txt b/messagebus/src/tests/slobrok/CMakeLists.txt
index d21768c1f6b..4fc2c70e211 100644
--- a/messagebus/src/tests/slobrok/CMakeLists.txt
+++ b/messagebus/src/tests/slobrok/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(messagebus_slobrok_test_app
+vespa_add_executable(messagebus_slobrok_test_app TEST
SOURCES
slobrok.cpp
DEPENDS
diff --git a/messagebus/src/tests/sourcesession/CMakeLists.txt b/messagebus/src/tests/sourcesession/CMakeLists.txt
index c2cf4f59682..bab8a55c811 100644
--- a/messagebus/src/tests/sourcesession/CMakeLists.txt
+++ b/messagebus/src/tests/sourcesession/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(messagebus_sourcesession_test_app
+vespa_add_executable(messagebus_sourcesession_test_app TEST
SOURCES
sourcesession.cpp
DEPENDS
diff --git a/messagebus/src/tests/targetpool/CMakeLists.txt b/messagebus/src/tests/targetpool/CMakeLists.txt
index 2fedf07d03d..6dd462269f1 100644
--- a/messagebus/src/tests/targetpool/CMakeLists.txt
+++ b/messagebus/src/tests/targetpool/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(messagebus_targetpool_test_app
+vespa_add_executable(messagebus_targetpool_test_app TEST
SOURCES
targetpool.cpp
DEPENDS
diff --git a/messagebus/src/tests/throttling/CMakeLists.txt b/messagebus/src/tests/throttling/CMakeLists.txt
index 28c27971e6f..54ec7a8696d 100644
--- a/messagebus/src/tests/throttling/CMakeLists.txt
+++ b/messagebus/src/tests/throttling/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(messagebus_throttling_test_app
+vespa_add_executable(messagebus_throttling_test_app TEST
SOURCES
throttling.cpp
DEPENDS
diff --git a/messagebus/src/tests/timeout/CMakeLists.txt b/messagebus/src/tests/timeout/CMakeLists.txt
index f50b81ff03f..d3ea5550031 100644
--- a/messagebus/src/tests/timeout/CMakeLists.txt
+++ b/messagebus/src/tests/timeout/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(messagebus_timeout_test_app
+vespa_add_executable(messagebus_timeout_test_app TEST
SOURCES
timeout.cpp
DEPENDS
diff --git a/messagebus/src/tests/trace-roundtrip/CMakeLists.txt b/messagebus/src/tests/trace-roundtrip/CMakeLists.txt
index 94ed14c8d99..16b6b45003d 100644
--- a/messagebus/src/tests/trace-roundtrip/CMakeLists.txt
+++ b/messagebus/src/tests/trace-roundtrip/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(messagebus_trace-roundtrip_test_app
+vespa_add_executable(messagebus_trace-roundtrip_test_app TEST
SOURCES
trace-roundtrip.cpp
DEPENDS
diff --git a/messagebus/test/src/tests/compile-cpp/CMakeLists.txt b/messagebus/test/src/tests/compile-cpp/CMakeLists.txt
index 5491399fce2..aa82392d661 100644
--- a/messagebus/test/src/tests/compile-cpp/CMakeLists.txt
+++ b/messagebus/test/src/tests/compile-cpp/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(messagebus_test_compile-cpp_test_app
+vespa_add_executable(messagebus_test_compile-cpp_test_app TEST
SOURCES
compile-cpp.cpp
DEPENDS
diff --git a/messagebus/test/src/tests/error/CMakeLists.txt b/messagebus/test/src/tests/error/CMakeLists.txt
index abd089571f5..5baadf2b18b 100644
--- a/messagebus/test/src/tests/error/CMakeLists.txt
+++ b/messagebus/test/src/tests/error/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(messagebus_test_error_test_app
+vespa_add_executable(messagebus_test_error_test_app TEST
SOURCES
error.cpp
DEPENDS
diff --git a/messagebus/test/src/tests/errorcodes/CMakeLists.txt b/messagebus/test/src/tests/errorcodes/CMakeLists.txt
index 3f08783b363..3e12ae340d3 100644
--- a/messagebus/test/src/tests/errorcodes/CMakeLists.txt
+++ b/messagebus/test/src/tests/errorcodes/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(messagebus_test_dumpcodes_app
+vespa_add_executable(messagebus_test_dumpcodes_app TEST
SOURCES
dumpcodes.cpp
DEPENDS
diff --git a/messagebus/test/src/tests/trace/CMakeLists.txt b/messagebus/test/src/tests/trace/CMakeLists.txt
index 5cebc9ae667..b2c31e19ba7 100644
--- a/messagebus/test/src/tests/trace/CMakeLists.txt
+++ b/messagebus/test/src/tests/trace/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(messagebus_test_trace_test_app
+vespa_add_executable(messagebus_test_trace_test_app TEST
SOURCES
trace.cpp
DEPENDS
diff --git a/metrics/src/tests/CMakeLists.txt b/metrics/src/tests/CMakeLists.txt
index b84701e9487..d361713d8ec 100644
--- a/metrics/src/tests/CMakeLists.txt
+++ b/metrics/src/tests/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(metrics_testrunner_app
+vespa_add_executable(metrics_testrunner_app TEST
SOURCES
testrunner.cpp
countmetrictest.cpp
diff --git a/persistence/src/tests/CMakeLists.txt b/persistence/src/tests/CMakeLists.txt
index 946e479d0c3..e547c4e72eb 100644
--- a/persistence/src/tests/CMakeLists.txt
+++ b/persistence/src/tests/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(persistence_testrunner_app
+vespa_add_executable(persistence_testrunner_app TEST
SOURCES
testrunner.cpp
DEPENDS
diff --git a/persistence/src/tests/dummyimpl/CMakeLists.txt b/persistence/src/tests/dummyimpl/CMakeLists.txt
index 5a257eb56f3..66758e8a0b4 100644
--- a/persistence/src/tests/dummyimpl/CMakeLists.txt
+++ b/persistence/src/tests/dummyimpl/CMakeLists.txt
@@ -4,7 +4,7 @@ vespa_add_library(persistence_testdummyimpl
dummyimpltest.cpp
DEPENDS
)
-vespa_add_executable(persistence_dummypersistence_test_app
+vespa_add_executable(persistence_dummypersistence_test_app TEST
SOURCES
dummypersistence_test.cpp
DEPENDS
diff --git a/persistence/src/tests/proxy/CMakeLists.txt b/persistence/src/tests/proxy/CMakeLists.txt
index c481bf73ce9..4f873f25e50 100644
--- a/persistence/src/tests/proxy/CMakeLists.txt
+++ b/persistence/src/tests/proxy/CMakeLists.txt
@@ -11,7 +11,7 @@ vespa_add_executable(persistence_providerproxy_test_app
DEPENDS
persistence
)
-vespa_add_executable(persistence_providerproxy_conformance_test_app
+vespa_add_executable(persistence_providerproxy_conformance_test_app TEST
SOURCES
providerproxy_conformancetest.cpp
DEPENDS
diff --git a/searchcommon/src/tests/attribute/config/CMakeLists.txt b/searchcommon/src/tests/attribute/config/CMakeLists.txt
index d0864c68240..302edb6495f 100644
--- a/searchcommon/src/tests/attribute/config/CMakeLists.txt
+++ b/searchcommon/src/tests/attribute/config/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(searchcommon_attribute_config_test_app
+vespa_add_executable(searchcommon_attribute_config_test_app TEST
SOURCES
attribute_config_test.cpp
DEPENDS
diff --git a/searchcommon/src/tests/schema/CMakeLists.txt b/searchcommon/src/tests/schema/CMakeLists.txt
index 0a600a55e7b..f7777dc8905 100644
--- a/searchcommon/src/tests/schema/CMakeLists.txt
+++ b/searchcommon/src/tests/schema/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(searchcommon_schema_test_app
+vespa_add_executable(searchcommon_schema_test_app TEST
SOURCES
schema_test.cpp
DEPENDS
diff --git a/searchcore/src/apps/tests/CMakeLists.txt b/searchcore/src/apps/tests/CMakeLists.txt
index 307ae51f7f6..37287fdda37 100644
--- a/searchcore/src/apps/tests/CMakeLists.txt
+++ b/searchcore/src/apps/tests/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(searchcore_persistenceconformance_test_app
+vespa_add_executable(searchcore_persistenceconformance_test_app TEST
SOURCES
persistenceconformance_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/applyattrupdates/CMakeLists.txt b/searchcore/src/tests/applyattrupdates/CMakeLists.txt
index 2778d0f62dc..8e4b11bb71f 100644
--- a/searchcore/src/tests/applyattrupdates/CMakeLists.txt
+++ b/searchcore/src/tests/applyattrupdates/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(searchcore_applyattrupdates_test_app
+vespa_add_executable(searchcore_applyattrupdates_test_app TEST
SOURCES
applyattrupdates.cpp
DEPENDS
diff --git a/searchcore/src/tests/fdispatch/randomrow/CMakeLists.txt b/searchcore/src/tests/fdispatch/randomrow/CMakeLists.txt
index f3ad936ded2..204dc8fa00d 100644
--- a/searchcore/src/tests/fdispatch/randomrow/CMakeLists.txt
+++ b/searchcore/src/tests/fdispatch/randomrow/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(searchcore_randomrow_test_app
+vespa_add_executable(searchcore_randomrow_test_app TEST
SOURCES
randomrow_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/fdispatch/search_path/CMakeLists.txt b/searchcore/src/tests/fdispatch/search_path/CMakeLists.txt
index 86067faa4cc..cf2f4872c54 100644
--- a/searchcore/src/tests/fdispatch/search_path/CMakeLists.txt
+++ b/searchcore/src/tests/fdispatch/search_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(searchcore_search_path_test_app
+vespa_add_executable(searchcore_search_path_test_app TEST
SOURCES
search_path_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/grouping/CMakeLists.txt b/searchcore/src/tests/grouping/CMakeLists.txt
index 245406187f6..1b7ae72f76d 100644
--- a/searchcore/src/tests/grouping/CMakeLists.txt
+++ b/searchcore/src/tests/grouping/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(searchcore_grouping_test_app
+vespa_add_executable(searchcore_grouping_test_app TEST
SOURCES
grouping.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/attribute/CMakeLists.txt b/searchcore/src/tests/proton/attribute/CMakeLists.txt
index 1439c2b2646..4082a8f5563 100644
--- a/searchcore/src/tests/proton/attribute/CMakeLists.txt
+++ b/searchcore/src/tests/proton/attribute/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(searchcore_attribute_test_app
+vespa_add_executable(searchcore_attribute_test_app TEST
SOURCES
attribute_test.cpp
DEPENDS
@@ -9,7 +9,7 @@ vespa_add_executable(searchcore_attribute_test_app
searchcore_pcommon
)
vespa_add_test(NAME searchcore_attribute_test_app COMMAND sh attribute_test.sh)
-vespa_add_executable(searchcore_attributeflush_test_app
+vespa_add_executable(searchcore_attributeflush_test_app TEST
SOURCES
attributeflush_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/attribute/attribute_manager/CMakeLists.txt b/searchcore/src/tests/proton/attribute/attribute_manager/CMakeLists.txt
index 7e8ab14a13b..d1a0e3a45e0 100644
--- a/searchcore/src/tests/proton/attribute/attribute_manager/CMakeLists.txt
+++ b/searchcore/src/tests/proton/attribute/attribute_manager/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(searchcore_attribute_manager_test_app
+vespa_add_executable(searchcore_attribute_manager_test_app TEST
SOURCES
attribute_manager_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/attribute/attribute_populator/CMakeLists.txt b/searchcore/src/tests/proton/attribute/attribute_populator/CMakeLists.txt
index 064759b88d1..e1de90c0284 100644
--- a/searchcore/src/tests/proton/attribute/attribute_populator/CMakeLists.txt
+++ b/searchcore/src/tests/proton/attribute/attribute_populator/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(searchcore_attribute_populator_test_app
+vespa_add_executable(searchcore_attribute_populator_test_app TEST
SOURCES
attribute_populator_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/attribute/attribute_usage_filter/CMakeLists.txt b/searchcore/src/tests/proton/attribute/attribute_usage_filter/CMakeLists.txt
index 2dd66c2a3ec..db904aaf5b3 100644
--- a/searchcore/src/tests/proton/attribute/attribute_usage_filter/CMakeLists.txt
+++ b/searchcore/src/tests/proton/attribute/attribute_usage_filter/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(searchcore_attribute_usage_filter_test_app
+vespa_add_executable(searchcore_attribute_usage_filter_test_app TEST
SOURCES
attribute_usage_filter_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/attribute/attributes_state_explorer/CMakeLists.txt b/searchcore/src/tests/proton/attribute/attributes_state_explorer/CMakeLists.txt
index 322d22c8f0d..158dd78c0a7 100644
--- a/searchcore/src/tests/proton/attribute/attributes_state_explorer/CMakeLists.txt
+++ b/searchcore/src/tests/proton/attribute/attributes_state_explorer/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(searchcore_attributes_state_explorer_test_app
+vespa_add_executable(searchcore_attributes_state_explorer_test_app TEST
SOURCES
attributes_state_explorer_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/attribute/document_field_populator/CMakeLists.txt b/searchcore/src/tests/proton/attribute/document_field_populator/CMakeLists.txt
index 4c6da0a3397..35a89676c5b 100644
--- a/searchcore/src/tests/proton/attribute/document_field_populator/CMakeLists.txt
+++ b/searchcore/src/tests/proton/attribute/document_field_populator/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(searchcore_document_field_populator_test_app
+vespa_add_executable(searchcore_document_field_populator_test_app TEST
SOURCES
document_field_populator_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/attribute/exclusive_attribute_read_accessor/CMakeLists.txt b/searchcore/src/tests/proton/attribute/exclusive_attribute_read_accessor/CMakeLists.txt
index c39025ae39f..81afcc7a4af 100644
--- a/searchcore/src/tests/proton/attribute/exclusive_attribute_read_accessor/CMakeLists.txt
+++ b/searchcore/src/tests/proton/attribute/exclusive_attribute_read_accessor/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(searchcore_exclusive_attribute_read_accessor_test_app
+vespa_add_executable(searchcore_exclusive_attribute_read_accessor_test_app TEST
SOURCES
exclusive_attribute_read_accessor_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/bucketdb/bucketdb/CMakeLists.txt b/searchcore/src/tests/proton/bucketdb/bucketdb/CMakeLists.txt
index f07ded6d89b..58c27f31726 100644
--- a/searchcore/src/tests/proton/bucketdb/bucketdb/CMakeLists.txt
+++ b/searchcore/src/tests/proton/bucketdb/bucketdb/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(searchcore_bucketdb_test_app
+vespa_add_executable(searchcore_bucketdb_test_app TEST
SOURCES
bucketdb_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/common/CMakeLists.txt b/searchcore/src/tests/proton/common/CMakeLists.txt
index 833bac4c065..5f0fa227c88 100644
--- a/searchcore/src/tests/proton/common/CMakeLists.txt
+++ b/searchcore/src/tests/proton/common/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(searchcore_schemautil_test_app
+vespa_add_executable(searchcore_schemautil_test_app TEST
SOURCES
schemautil_test.cpp
DEPENDS
searchcore_pcommon
)
vespa_add_test(NAME searchcore_schemautil_test_app COMMAND searchcore_schemautil_test_app)
-vespa_add_executable(searchcore_selectpruner_test_app
+vespa_add_executable(searchcore_selectpruner_test_app TEST
SOURCES
selectpruner_test.cpp
DEPENDS
searchcore_pcommon
)
vespa_add_test(NAME searchcore_selectpruner_test_app COMMAND searchcore_selectpruner_test_app)
-vespa_add_executable(searchcore_cachedselect_test_app
+vespa_add_executable(searchcore_cachedselect_test_app TEST
SOURCES
cachedselect_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/common/document_type_inspector/CMakeLists.txt b/searchcore/src/tests/proton/common/document_type_inspector/CMakeLists.txt
index f5c4610fc1b..cd4533510ff 100644
--- a/searchcore/src/tests/proton/common/document_type_inspector/CMakeLists.txt
+++ b/searchcore/src/tests/proton/common/document_type_inspector/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(searchcore_document_type_inspector_test_app
+vespa_add_executable(searchcore_document_type_inspector_test_app TEST
SOURCES
document_type_inspector_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/common/state_reporter_utils/CMakeLists.txt b/searchcore/src/tests/proton/common/state_reporter_utils/CMakeLists.txt
index 9b1ffd8aef2..d872cc5d89f 100644
--- a/searchcore/src/tests/proton/common/state_reporter_utils/CMakeLists.txt
+++ b/searchcore/src/tests/proton/common/state_reporter_utils/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(searchcore_state_reporter_utils_test_app
+vespa_add_executable(searchcore_state_reporter_utils_test_app TEST
SOURCES
state_reporter_utils_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/config/CMakeLists.txt b/searchcore/src/tests/proton/config/CMakeLists.txt
index 803556c2ae1..7bef6552154 100644
--- a/searchcore/src/tests/proton/config/CMakeLists.txt
+++ b/searchcore/src/tests/proton/config/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(searchcore_config_test_app
+vespa_add_executable(searchcore_config_test_app TEST
SOURCES
config.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/docsummary/CMakeLists.txt b/searchcore/src/tests/proton/docsummary/CMakeLists.txt
index dca65528840..7550a80aa3a 100644
--- a/searchcore/src/tests/proton/docsummary/CMakeLists.txt
+++ b/searchcore/src/tests/proton/docsummary/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(searchcore_docsummary_test_app
+vespa_add_executable(searchcore_docsummary_test_app TEST
SOURCES
docsummary.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/document_iterator/CMakeLists.txt b/searchcore/src/tests/proton/document_iterator/CMakeLists.txt
index 03d910ef02e..32a8e44efd5 100644
--- a/searchcore/src/tests/proton/document_iterator/CMakeLists.txt
+++ b/searchcore/src/tests/proton/document_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(searchcore_document_iterator_test_app
+vespa_add_executable(searchcore_document_iterator_test_app TEST
SOURCES
document_iterator_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/documentdb/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/CMakeLists.txt
index 9270a4b0b7c..7cd23e47d00 100644
--- a/searchcore/src/tests/proton/documentdb/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/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(searchcore_documentdb_test_app
+vespa_add_executable(searchcore_documentdb_test_app TEST
SOURCES
documentdb_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/documentdb/buckethandler/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/buckethandler/CMakeLists.txt
index 3c1f5c79a57..226d8965844 100644
--- a/searchcore/src/tests/proton/documentdb/buckethandler/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/buckethandler/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(searchcore_buckethandler_test_app
+vespa_add_executable(searchcore_buckethandler_test_app TEST
SOURCES
buckethandler_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/documentdb/clusterstatehandler/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/clusterstatehandler/CMakeLists.txt
index f107cddd103..6244fb0537a 100644
--- a/searchcore/src/tests/proton/documentdb/clusterstatehandler/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/clusterstatehandler/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(searchcore_clusterstatehandler_test_app
+vespa_add_executable(searchcore_clusterstatehandler_test_app TEST
SOURCES
clusterstatehandler_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/documentdb/combiningfeedview/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/combiningfeedview/CMakeLists.txt
index 74f605d36d0..e435c27fbde 100644
--- a/searchcore/src/tests/proton/documentdb/combiningfeedview/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/combiningfeedview/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(searchcore_combiningfeedview_test_app
+vespa_add_executable(searchcore_combiningfeedview_test_app TEST
SOURCES
combiningfeedview_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/documentdb/configurer/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/configurer/CMakeLists.txt
index ee18f0f6938..1e8b241b72c 100644
--- a/searchcore/src/tests/proton/documentdb/configurer/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/configurer/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(searchcore_configurer_test_app
+vespa_add_executable(searchcore_configurer_test_app TEST
SOURCES
configurer_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/documentdb/configvalidator/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/configvalidator/CMakeLists.txt
index c7a3a6235cf..cea6144fd99 100644
--- a/searchcore/src/tests/proton/documentdb/configvalidator/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/configvalidator/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(searchcore_configvalidator_test_app
+vespa_add_executable(searchcore_configvalidator_test_app TEST
SOURCES
configvalidator_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/documentdb/document_scan_iterator/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/document_scan_iterator/CMakeLists.txt
index 1a342660f7c..1789beee7da 100644
--- a/searchcore/src/tests/proton/documentdb/document_scan_iterator/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/document_scan_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(searchcore_document_scan_iterator_test_app
+vespa_add_executable(searchcore_document_scan_iterator_test_app TEST
SOURCES
document_scan_iterator_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/documentdb/document_subdbs/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/document_subdbs/CMakeLists.txt
index d79b9ad92ae..121b37bbfcc 100644
--- a/searchcore/src/tests/proton/documentdb/document_subdbs/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/document_subdbs/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(searchcore_document_subdbs_test_app
+vespa_add_executable(searchcore_document_subdbs_test_app TEST
SOURCES
document_subdbs_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/documentbucketmover/CMakeLists.txt
index 97a9ae1516b..a550ce6451f 100644
--- a/searchcore/src/tests/proton/documentdb/documentbucketmover/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/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(searchcore_documentbucketmover_test_app
+vespa_add_executable(searchcore_documentbucketmover_test_app TEST
SOURCES
documentbucketmover_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfig/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/documentdbconfig/CMakeLists.txt
index b9105fc9c91..1ad3b7f21f6 100644
--- a/searchcore/src/tests/proton/documentdb/documentdbconfig/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/documentdbconfig/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(searchcore_documentdbconfig_test_app
+vespa_add_executable(searchcore_documentdbconfig_test_app TEST
SOURCES
documentdbconfig_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/documentdbconfigscout/CMakeLists.txt
index e1dea56782d..8de0cc67b2a 100644
--- a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/documentdbconfigscout/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(searchcore_documentdbconfigscout_test_app
+vespa_add_executable(searchcore_documentdbconfigscout_test_app TEST
SOURCES
documentdbconfigscout_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt
index 756c11f35b4..fe848e0588b 100644
--- a/searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/feedhandler/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(searchcore_feedhandler_test_app
+vespa_add_executable(searchcore_feedhandler_test_app TEST
SOURCES
feedhandler_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/documentdb/feedview/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/feedview/CMakeLists.txt
index 0ea395a339a..a4cebe05541 100644
--- a/searchcore/src/tests/proton/documentdb/feedview/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/feedview/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(searchcore_feedview_test_app
+vespa_add_executable(searchcore_feedview_test_app TEST
SOURCES
feedview_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt
index 458607e66c5..f5c40a85192 100644
--- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/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(searchcore_fileconfigmanager_test_app
+vespa_add_executable(searchcore_fileconfigmanager_test_app TEST
SOURCES
fileconfigmanager_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/CMakeLists.txt
index 3b81994e7da..e858efd45ea 100644
--- a/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/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(searchcore_job_tracked_maintenance_job_test_app
+vespa_add_executable(searchcore_job_tracked_maintenance_job_test_app TEST
SOURCES
job_tracked_maintenance_job_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/documentdb/lid_space_compaction/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/lid_space_compaction/CMakeLists.txt
index 938e0dc7baf..6f993ac1593 100644
--- a/searchcore/src/tests/proton/documentdb/lid_space_compaction/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/lid_space_compaction/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(searchcore_lid_space_compaction_test_app
+vespa_add_executable(searchcore_lid_space_compaction_test_app TEST
SOURCES
lid_space_compaction_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/maintenancecontroller/CMakeLists.txt
index 4f26a79f0eb..388d527dec5 100644
--- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/maintenancecontroller/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(searchcore_maintenancecontroller_test_app
+vespa_add_executable(searchcore_maintenancecontroller_test_app TEST
SOURCES
maintenancecontroller_test.cpp
DEPENDS
@@ -18,7 +18,7 @@ vespa_add_executable(searchcore_maintenancecontroller_test_app
searchcore_fconfig
)
vespa_add_test(NAME searchcore_maintenancecontroller_test_app COMMAND searchcore_maintenancecontroller_test_app)
-vespa_add_executable(searchcore_frozenbucketsmap_test_app
+vespa_add_executable(searchcore_frozenbucketsmap_test_app TEST
SOURCES
frozenbucketsmap_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/CMakeLists.txt
index 294360b51ba..7c8b092811f 100644
--- a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/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(searchcore_storeonlyfeedview_test_app
+vespa_add_executable(searchcore_storeonlyfeedview_test_app TEST
SOURCES
storeonlyfeedview_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt b/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt
index fbaa86cafc8..56b07ffc181 100644
--- a/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentmetastore/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(searchcore_documentmetastore_test_app
+vespa_add_executable(searchcore_documentmetastore_test_app TEST
SOURCES
documentmetastore_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/CMakeLists.txt b/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/CMakeLists.txt
index 5e333c74b2f..8aab9158529 100644
--- a/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/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(searchcore_lidreusedelayer_test_app
+vespa_add_executable(searchcore_lidreusedelayer_test_app TEST
SOURCES
lidreusedelayer_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/feed_and_search/CMakeLists.txt b/searchcore/src/tests/proton/feed_and_search/CMakeLists.txt
index b6d1258a386..0921195e56c 100644
--- a/searchcore/src/tests/proton/feed_and_search/CMakeLists.txt
+++ b/searchcore/src/tests/proton/feed_and_search/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(searchcore_feed_and_search_test_app
+vespa_add_executable(searchcore_feed_and_search_test_app TEST
SOURCES
feed_and_search.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/feedoperation/CMakeLists.txt b/searchcore/src/tests/proton/feedoperation/CMakeLists.txt
index fc47a3bde85..613d4b9f603 100644
--- a/searchcore/src/tests/proton/feedoperation/CMakeLists.txt
+++ b/searchcore/src/tests/proton/feedoperation/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(searchcore_feedoperation_test_app
+vespa_add_executable(searchcore_feedoperation_test_app TEST
SOURCES
feedoperation_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/feedtoken/CMakeLists.txt b/searchcore/src/tests/proton/feedtoken/CMakeLists.txt
index 328d872f668..438c0b72b1c 100644
--- a/searchcore/src/tests/proton/feedtoken/CMakeLists.txt
+++ b/searchcore/src/tests/proton/feedtoken/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(searchcore_feedtoken_test_app
+vespa_add_executable(searchcore_feedtoken_test_app TEST
SOURCES
feedtoken.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/flushengine/CMakeLists.txt b/searchcore/src/tests/proton/flushengine/CMakeLists.txt
index 4fc59180946..bbc97818f51 100644
--- a/searchcore/src/tests/proton/flushengine/CMakeLists.txt
+++ b/searchcore/src/tests/proton/flushengine/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(searchcore_flushengine_test_app
+vespa_add_executable(searchcore_flushengine_test_app TEST
SOURCES
flushengine.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/CMakeLists.txt b/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/CMakeLists.txt
index a4bff892ffa..d1a2c909a37 100644
--- a/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/CMakeLists.txt
+++ b/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/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(searchcore_flushengine_prepare_restart_flush_strategy_test_app
+vespa_add_executable(searchcore_flushengine_prepare_restart_flush_strategy_test_app TEST
SOURCES
prepare_restart_flush_strategy_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/index/CMakeLists.txt b/searchcore/src/tests/proton/index/CMakeLists.txt
index 46cbf4117ac..be3fff431a9 100644
--- a/searchcore/src/tests/proton/index/CMakeLists.txt
+++ b/searchcore/src/tests/proton/index/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(searchcore_indexmanager_test_app
+vespa_add_executable(searchcore_indexmanager_test_app TEST
SOURCES
indexmanager_test.cpp
DEPENDS
@@ -9,7 +9,7 @@ vespa_add_executable(searchcore_indexmanager_test_app
searchcore_pcommon
searchcore_util
)
-vespa_add_executable(searchcore_fusionrunner_test_app
+vespa_add_executable(searchcore_fusionrunner_test_app TEST
SOURCES
fusionrunner_test.cpp
DEPENDS
@@ -18,13 +18,13 @@ vespa_add_executable(searchcore_fusionrunner_test_app
searchcore_pcommon
searchcore_util
)
-vespa_add_executable(searchcore_diskindexcleaner_test_app
+vespa_add_executable(searchcore_diskindexcleaner_test_app TEST
SOURCES
diskindexcleaner_test.cpp
DEPENDS
searchcore_index
)
-vespa_add_executable(searchcore_indexcollection_test_app
+vespa_add_executable(searchcore_indexcollection_test_app TEST
SOURCES
indexcollection_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/index/index_writer/CMakeLists.txt b/searchcore/src/tests/proton/index/index_writer/CMakeLists.txt
index 88db11dbdba..d588baf7211 100644
--- a/searchcore/src/tests/proton/index/index_writer/CMakeLists.txt
+++ b/searchcore/src/tests/proton/index/index_writer/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(searchcore_index_writer_test_app
+vespa_add_executable(searchcore_index_writer_test_app TEST
SOURCES
index_writer_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/initializer/CMakeLists.txt b/searchcore/src/tests/proton/initializer/CMakeLists.txt
index 0f20324cae3..165e12fb808 100644
--- a/searchcore/src/tests/proton/initializer/CMakeLists.txt
+++ b/searchcore/src/tests/proton/initializer/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(searchcore_task_runner_test_app
+vespa_add_executable(searchcore_task_runner_test_app TEST
SOURCES
task_runner_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/matchengine/CMakeLists.txt b/searchcore/src/tests/proton/matchengine/CMakeLists.txt
index 32c0b47ae4b..820fd8a1bcb 100644
--- a/searchcore/src/tests/proton/matchengine/CMakeLists.txt
+++ b/searchcore/src/tests/proton/matchengine/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(searchcore_matchengine_test_app
+vespa_add_executable(searchcore_matchengine_test_app TEST
SOURCES
matchengine.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/matching/CMakeLists.txt b/searchcore/src/tests/proton/matching/CMakeLists.txt
index 8007ff0344d..ecd9c19eec0 100644
--- a/searchcore/src/tests/proton/matching/CMakeLists.txt
+++ b/searchcore/src/tests/proton/matching/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(searchcore_matching_test_app
+vespa_add_executable(searchcore_matching_test_app TEST
SOURCES
matching_test.cpp
DEPENDS
@@ -14,7 +14,7 @@ vespa_add_executable(searchcore_matching_test_app
searchcore_util
)
vespa_add_test(NAME searchcore_matching_test_app COMMAND searchcore_matching_test_app)
-vespa_add_executable(searchcore_sessionmanager_test_app
+vespa_add_executable(searchcore_sessionmanager_test_app TEST
SOURCES
sessionmanager_test.cpp
DEPENDS
@@ -22,14 +22,14 @@ vespa_add_executable(searchcore_sessionmanager_test_app
searchcore_grouping
)
vespa_add_test(NAME searchcore_sessionmanager_test_app COMMAND searchcore_sessionmanager_test_app)
-vespa_add_executable(searchcore_matching_stats_test_app
+vespa_add_executable(searchcore_matching_stats_test_app TEST
SOURCES
matching_stats_test.cpp
DEPENDS
searchcore_matching
)
vespa_add_test(NAME searchcore_matching_stats_test_app COMMAND searchcore_matching_stats_test_app)
-vespa_add_executable(searchcore_query_test_app
+vespa_add_executable(searchcore_query_test_app TEST
SOURCES
query_test.cpp
DEPENDS
@@ -37,21 +37,21 @@ vespa_add_executable(searchcore_query_test_app
searchcore_matching
)
vespa_add_test(NAME searchcore_query_test_app COMMAND searchcore_query_test_app)
-vespa_add_executable(searchcore_termdataextractor_test_app
+vespa_add_executable(searchcore_termdataextractor_test_app TEST
SOURCES
termdataextractor_test.cpp
DEPENDS
searchcore_matching
)
vespa_add_test(NAME searchcore_termdataextractor_test_app COMMAND searchcore_termdataextractor_test_app)
-vespa_add_executable(searchcore_resolveviewvisitor_test_app
+vespa_add_executable(searchcore_resolveviewvisitor_test_app TEST
SOURCES
resolveviewvisitor_test.cpp
DEPENDS
searchcore_matching
)
vespa_add_test(NAME searchcore_resolveviewvisitor_test_app COMMAND searchcore_resolveviewvisitor_test_app)
-vespa_add_executable(searchcore_querynodes_test_app
+vespa_add_executable(searchcore_querynodes_test_app TEST
SOURCES
querynodes_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/matching/docid_range_scheduler/CMakeLists.txt b/searchcore/src/tests/proton/matching/docid_range_scheduler/CMakeLists.txt
index 3892ac41b92..6cba6019fa5 100644
--- a/searchcore/src/tests/proton/matching/docid_range_scheduler/CMakeLists.txt
+++ b/searchcore/src/tests/proton/matching/docid_range_scheduler/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(searchcore_docid_range_scheduler_test_app
+vespa_add_executable(searchcore_docid_range_scheduler_test_app TEST
SOURCES
docid_range_scheduler_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/matching/match_loop_communicator/CMakeLists.txt b/searchcore/src/tests/proton/matching/match_loop_communicator/CMakeLists.txt
index 513e002f064..e3b9d94b659 100644
--- a/searchcore/src/tests/proton/matching/match_loop_communicator/CMakeLists.txt
+++ b/searchcore/src/tests/proton/matching/match_loop_communicator/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(searchcore_match_loop_communicator_test_app
+vespa_add_executable(searchcore_match_loop_communicator_test_app TEST
SOURCES
match_loop_communicator_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/matching/match_phase_limiter/CMakeLists.txt b/searchcore/src/tests/proton/matching/match_phase_limiter/CMakeLists.txt
index 78c16d1435d..54edcf2f61c 100644
--- a/searchcore/src/tests/proton/matching/match_phase_limiter/CMakeLists.txt
+++ b/searchcore/src/tests/proton/matching/match_phase_limiter/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(searchcore_match_phase_limiter_test_app
+vespa_add_executable(searchcore_match_phase_limiter_test_app TEST
SOURCES
match_phase_limiter_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/matching/partial_result/CMakeLists.txt b/searchcore/src/tests/proton/matching/partial_result/CMakeLists.txt
index 39c1679fc27..8246a35f8fe 100644
--- a/searchcore/src/tests/proton/matching/partial_result/CMakeLists.txt
+++ b/searchcore/src/tests/proton/matching/partial_result/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(searchcore_partial_result_test_app
+vespa_add_executable(searchcore_partial_result_test_app TEST
SOURCES
partial_result_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/metrics/documentdb_job_trackers/CMakeLists.txt b/searchcore/src/tests/proton/metrics/documentdb_job_trackers/CMakeLists.txt
index bf77c583468..42c2fc29ada 100644
--- a/searchcore/src/tests/proton/metrics/documentdb_job_trackers/CMakeLists.txt
+++ b/searchcore/src/tests/proton/metrics/documentdb_job_trackers/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(searchcore_documentdb_job_trackers_test_app
+vespa_add_executable(searchcore_documentdb_job_trackers_test_app TEST
SOURCES
documentdb_job_trackers_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/metrics/job_load_sampler/CMakeLists.txt b/searchcore/src/tests/proton/metrics/job_load_sampler/CMakeLists.txt
index 478a7201228..ae4a6df9373 100644
--- a/searchcore/src/tests/proton/metrics/job_load_sampler/CMakeLists.txt
+++ b/searchcore/src/tests/proton/metrics/job_load_sampler/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(searchcore_job_load_sampler_test_app
+vespa_add_executable(searchcore_job_load_sampler_test_app TEST
SOURCES
job_load_sampler_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/metrics/job_tracked_flush/CMakeLists.txt b/searchcore/src/tests/proton/metrics/job_tracked_flush/CMakeLists.txt
index f4544740f8e..1a1644097be 100644
--- a/searchcore/src/tests/proton/metrics/job_tracked_flush/CMakeLists.txt
+++ b/searchcore/src/tests/proton/metrics/job_tracked_flush/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(searchcore_job_tracked_flush_test_app
+vespa_add_executable(searchcore_job_tracked_flush_test_app TEST
SOURCES
job_tracked_flush_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/metrics/metrics_engine/CMakeLists.txt b/searchcore/src/tests/proton/metrics/metrics_engine/CMakeLists.txt
index e50e584e578..1c75b9af82b 100644
--- a/searchcore/src/tests/proton/metrics/metrics_engine/CMakeLists.txt
+++ b/searchcore/src/tests/proton/metrics/metrics_engine/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(searchcore_metrics_engine_test_app
+vespa_add_executable(searchcore_metrics_engine_test_app TEST
SOURCES
metrics_engine_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/persistenceengine/CMakeLists.txt b/searchcore/src/tests/proton/persistenceengine/CMakeLists.txt
index b5e42ac5075..6317d48bae6 100644
--- a/searchcore/src/tests/proton/persistenceengine/CMakeLists.txt
+++ b/searchcore/src/tests/proton/persistenceengine/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(searchcore_persistenceengine_test_app
+vespa_add_executable(searchcore_persistenceengine_test_app TEST
SOURCES
persistenceengine_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/CMakeLists.txt b/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/CMakeLists.txt
index 5e17a1d6606..07abb46b3e1 100644
--- a/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/CMakeLists.txt
+++ b/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/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(searchcore_attribute_reprocessing_initializer_test_app
+vespa_add_executable(searchcore_attribute_reprocessing_initializer_test_app TEST
SOURCES
attribute_reprocessing_initializer_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/CMakeLists.txt b/searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/CMakeLists.txt
index 170e381c99c..50f6d2e55d9 100644
--- a/searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/CMakeLists.txt
+++ b/searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/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(searchcore_document_reprocessing_handler_test_app
+vespa_add_executable(searchcore_document_reprocessing_handler_test_app TEST
SOURCES
document_reprocessing_handler_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/reprocessing/reprocessing_runner/CMakeLists.txt b/searchcore/src/tests/proton/reprocessing/reprocessing_runner/CMakeLists.txt
index f5eff73f9f0..6e2e0689440 100644
--- a/searchcore/src/tests/proton/reprocessing/reprocessing_runner/CMakeLists.txt
+++ b/searchcore/src/tests/proton/reprocessing/reprocessing_runner/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(searchcore_reprocessing_runner_test_app
+vespa_add_executable(searchcore_reprocessing_runner_test_app TEST
SOURCES
reprocessing_runner_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/server/CMakeLists.txt b/searchcore/src/tests/proton/server/CMakeLists.txt
index 3ae89e7393d..7b689e33de7 100644
--- a/searchcore/src/tests/proton/server/CMakeLists.txt
+++ b/searchcore/src/tests/proton/server/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(searchcore_attribute_metrics_test_app
+vespa_add_executable(searchcore_attribute_metrics_test_app TEST
SOURCES
attribute_metrics_test.cpp
DEPENDS
@@ -7,7 +7,7 @@ vespa_add_executable(searchcore_attribute_metrics_test_app
searchcore_proton_metrics
)
vespa_add_test(NAME searchcore_attribute_metrics_test_app COMMAND searchcore_attribute_metrics_test_app)
-vespa_add_executable(searchcore_documentretriever_test_app
+vespa_add_executable(searchcore_documentretriever_test_app TEST
SOURCES
documentretriever_test.cpp
DEPENDS
@@ -21,7 +21,7 @@ vespa_add_executable(searchcore_documentretriever_test_app
searchcore_persistenceengine
)
vespa_add_test(NAME searchcore_documentretriever_test_app COMMAND searchcore_documentretriever_test_app)
-vespa_add_executable(searchcore_feeddebugger_test_app
+vespa_add_executable(searchcore_feeddebugger_test_app TEST
SOURCES
feeddebugger_test.cpp
DEPENDS
@@ -29,7 +29,7 @@ vespa_add_executable(searchcore_feeddebugger_test_app
searchcore_pcommon
)
vespa_add_test(NAME searchcore_feeddebugger_test_app COMMAND searchcore_feeddebugger_test_app)
-vespa_add_executable(searchcore_feedstates_test_app
+vespa_add_executable(searchcore_feedstates_test_app TEST
SOURCES
feedstates_test.cpp
DEPENDS
@@ -42,7 +42,7 @@ vespa_add_executable(searchcore_feedstates_test_app
searchcore_fconfig
)
vespa_add_test(NAME searchcore_feedstates_test_app COMMAND searchcore_feedstates_test_app)
-vespa_add_executable(searchcore_memoryconfigstore_test_app
+vespa_add_executable(searchcore_memoryconfigstore_test_app TEST
SOURCES
memoryconfigstore_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/server/data_directory_upgrader/CMakeLists.txt b/searchcore/src/tests/proton/server/data_directory_upgrader/CMakeLists.txt
index 9c8048a0a69..ffcc7a82d2e 100644
--- a/searchcore/src/tests/proton/server/data_directory_upgrader/CMakeLists.txt
+++ b/searchcore/src/tests/proton/server/data_directory_upgrader/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(searchcore_data_directory_upgrader_test_app
+vespa_add_executable(searchcore_data_directory_upgrader_test_app TEST
SOURCES
data_directory_upgrader_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/server/disk_mem_usage_filter/CMakeLists.txt b/searchcore/src/tests/proton/server/disk_mem_usage_filter/CMakeLists.txt
index 1d9b0234d76..48f64db5d82 100644
--- a/searchcore/src/tests/proton/server/disk_mem_usage_filter/CMakeLists.txt
+++ b/searchcore/src/tests/proton/server/disk_mem_usage_filter/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(searchcore_disk_mem_usage_filter_test_app
+vespa_add_executable(searchcore_disk_mem_usage_filter_test_app TEST
SOURCES
disk_mem_usage_filter_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/server/health_adapter/CMakeLists.txt b/searchcore/src/tests/proton/server/health_adapter/CMakeLists.txt
index 2fee205f636..b4dab3d9f54 100644
--- a/searchcore/src/tests/proton/server/health_adapter/CMakeLists.txt
+++ b/searchcore/src/tests/proton/server/health_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(searchcore_health_adapter_test_app
+vespa_add_executable(searchcore_health_adapter_test_app TEST
SOURCES
health_adapter_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/server/memoryflush/CMakeLists.txt b/searchcore/src/tests/proton/server/memoryflush/CMakeLists.txt
index 51ea36dc077..aad23ab7b0a 100644
--- a/searchcore/src/tests/proton/server/memoryflush/CMakeLists.txt
+++ b/searchcore/src/tests/proton/server/memoryflush/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(searchcore_memoryflush_test_app
+vespa_add_executable(searchcore_memoryflush_test_app TEST
SOURCES
memoryflush_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/server/visibility_handler/CMakeLists.txt b/searchcore/src/tests/proton/server/visibility_handler/CMakeLists.txt
index f86504c84dc..247bda1f5f8 100644
--- a/searchcore/src/tests/proton/server/visibility_handler/CMakeLists.txt
+++ b/searchcore/src/tests/proton/server/visibility_handler/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(searchcore_visibility_handler_test_app
+vespa_add_executable(searchcore_visibility_handler_test_app TEST
SOURCES
visibility_handler_test.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/statusreport/CMakeLists.txt b/searchcore/src/tests/proton/statusreport/CMakeLists.txt
index fa11b343d0d..98462c157fc 100644
--- a/searchcore/src/tests/proton/statusreport/CMakeLists.txt
+++ b/searchcore/src/tests/proton/statusreport/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(searchcore_statusreport_test_app
+vespa_add_executable(searchcore_statusreport_test_app TEST
SOURCES
statusreport.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/summaryengine/CMakeLists.txt b/searchcore/src/tests/proton/summaryengine/CMakeLists.txt
index af3b09db1de..d3699428a9d 100644
--- a/searchcore/src/tests/proton/summaryengine/CMakeLists.txt
+++ b/searchcore/src/tests/proton/summaryengine/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(searchcore_summaryengine_test_app
+vespa_add_executable(searchcore_summaryengine_test_app TEST
SOURCES
summaryengine.cpp
DEPENDS
diff --git a/searchcore/src/tests/proton/verify_ranksetup/CMakeLists.txt b/searchcore/src/tests/proton/verify_ranksetup/CMakeLists.txt
index 2d74c323c1a..a3a03ea8849 100644
--- a/searchcore/src/tests/proton/verify_ranksetup/CMakeLists.txt
+++ b/searchcore/src/tests/proton/verify_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(searchcore_verify_ranksetup_test_app
+vespa_add_executable(searchcore_verify_ranksetup_test_app TEST
SOURCES
verify_ranksetup_test.cpp
DEPENDS
diff --git a/searchcorespi/src/tests/plugin/CMakeLists.txt b/searchcorespi/src/tests/plugin/CMakeLists.txt
index ae70cc2d7f7..ef7f0ad316f 100644
--- a/searchcorespi/src/tests/plugin/CMakeLists.txt
+++ b/searchcorespi/src/tests/plugin/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(searchcorespi_plugin_test_app
+vespa_add_executable(searchcorespi_plugin_test_app TEST
SOURCES
plugin_test.cpp
DEPENDS
@@ -10,7 +10,7 @@ vespa_add_test(
COMMAND searchcorespi_plugin_test_app
ENVIRONMENT "LD_LIBRARY_PATH=."
)
-vespa_add_executable(searchcorespi_factoryregistry_test_app
+vespa_add_executable(searchcorespi_factoryregistry_test_app TEST
SOURCES
factoryregistry_test.cpp
DEPENDS
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
diff --git a/searchsummary/src/tests/docsumformat/CMakeLists.txt b/searchsummary/src/tests/docsumformat/CMakeLists.txt
index ac8d2151792..0cae34527e6 100644
--- a/searchsummary/src/tests/docsumformat/CMakeLists.txt
+++ b/searchsummary/src/tests/docsumformat/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(searchsummary_docsum-pack_app
+vespa_add_executable(searchsummary_docsum-pack_app TEST
SOURCES
docsum-pack.cpp
DEPENDS
diff --git a/searchsummary/src/tests/docsummary/CMakeLists.txt b/searchsummary/src/tests/docsummary/CMakeLists.txt
index 7eaa78d923e..8f116721338 100644
--- a/searchsummary/src/tests/docsummary/CMakeLists.txt
+++ b/searchsummary/src/tests/docsummary/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(searchsummary_positionsdfw_test_app
+vespa_add_executable(searchsummary_positionsdfw_test_app TEST
SOURCES
positionsdfw_test.cpp
DEPENDS
diff --git a/searchsummary/src/tests/docsummary/slime_summary/CMakeLists.txt b/searchsummary/src/tests/docsummary/slime_summary/CMakeLists.txt
index a2bd3bbc610..3e5e19da8b0 100644
--- a/searchsummary/src/tests/docsummary/slime_summary/CMakeLists.txt
+++ b/searchsummary/src/tests/docsummary/slime_summary/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(searchsummary_slime_summary_test_app
+vespa_add_executable(searchsummary_slime_summary_test_app TEST
SOURCES
slime_summary_test.cpp
DEPENDS
diff --git a/searchsummary/src/tests/extractkeywords/CMakeLists.txt b/searchsummary/src/tests/extractkeywords/CMakeLists.txt
index d726ffe794c..48fe0aa9785 100644
--- a/searchsummary/src/tests/extractkeywords/CMakeLists.txt
+++ b/searchsummary/src/tests/extractkeywords/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(searchsummary_extractkeywordstest_app
+vespa_add_executable(searchsummary_extractkeywordstest_app TEST
SOURCES
extractkeywordstest.cpp
DEPENDS
diff --git a/slobrok/src/tests/backoff/CMakeLists.txt b/slobrok/src/tests/backoff/CMakeLists.txt
index 800f984d69d..b64b9f36cba 100644
--- a/slobrok/src/tests/backoff/CMakeLists.txt
+++ b/slobrok/src/tests/backoff/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(slobrok_backoff_test_app
+vespa_add_executable(slobrok_backoff_test_app TEST
SOURCES
testbackoff.cpp
DEPENDS
diff --git a/slobrok/src/tests/configure/CMakeLists.txt b/slobrok/src/tests/configure/CMakeLists.txt
index a9988ead03f..93718d305b3 100644
--- a/slobrok/src/tests/configure/CMakeLists.txt
+++ b/slobrok/src/tests/configure/CMakeLists.txt
@@ -4,7 +4,7 @@ vespa_add_executable(slobrok_gencfg_app
gencfg.cpp
DEPENDS
)
-vespa_add_executable(slobrok_configure_test_app
+vespa_add_executable(slobrok_configure_test_app TEST
SOURCES
configure.cpp
DEPENDS
diff --git a/slobrok/src/tests/mirrorapi/CMakeLists.txt b/slobrok/src/tests/mirrorapi/CMakeLists.txt
index 8ae5107dbcb..62b1d32eac7 100644
--- a/slobrok/src/tests/mirrorapi/CMakeLists.txt
+++ b/slobrok/src/tests/mirrorapi/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(slobrok_mirrorapi_test_app
+vespa_add_executable(slobrok_mirrorapi_test_app TEST
SOURCES
mirrorapi.cpp
DEPENDS
@@ -7,7 +7,7 @@ vespa_add_executable(slobrok_mirrorapi_test_app
slobrok_slobrokserver
)
vespa_add_test(NAME slobrok_mirrorapi_test_app COMMAND slobrok_mirrorapi_test_app)
-vespa_add_executable(slobrok_mirror_match_test_app
+vespa_add_executable(slobrok_mirror_match_test_app TEST
SOURCES
match_test.cpp
DEPENDS
diff --git a/slobrok/src/tests/multi/CMakeLists.txt b/slobrok/src/tests/multi/CMakeLists.txt
index a133cd79a29..d8ee6603f69 100644
--- a/slobrok/src/tests/multi/CMakeLists.txt
+++ b/slobrok/src/tests/multi/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(slobrok_multi_test_app
+vespa_add_executable(slobrok_multi_test_app TEST
SOURCES
multi.cpp
DEPENDS
diff --git a/slobrok/src/tests/oldapi/CMakeLists.txt b/slobrok/src/tests/oldapi/CMakeLists.txt
index b4def919688..0616e0e0696 100644
--- a/slobrok/src/tests/oldapi/CMakeLists.txt
+++ b/slobrok/src/tests/oldapi/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(slobrok_oldapi_test_app
+vespa_add_executable(slobrok_oldapi_test_app TEST
SOURCES
old.cpp
mirror.cpp
diff --git a/slobrok/src/tests/registerapi/CMakeLists.txt b/slobrok/src/tests/registerapi/CMakeLists.txt
index de4f84cbf9f..366a5adda78 100644
--- a/slobrok/src/tests/registerapi/CMakeLists.txt
+++ b/slobrok/src/tests/registerapi/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(slobrok_registerapi_test_app
+vespa_add_executable(slobrok_registerapi_test_app TEST
SOURCES
registerapi.cpp
DEPENDS
diff --git a/slobrok/src/tests/standalone/CMakeLists.txt b/slobrok/src/tests/standalone/CMakeLists.txt
index 60b10b9ddd0..ce9517a67af 100644
--- a/slobrok/src/tests/standalone/CMakeLists.txt
+++ b/slobrok/src/tests/standalone/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(slobrok_standalone_test_app
+vespa_add_executable(slobrok_standalone_test_app TEST
SOURCES
standalone.cpp
DEPENDS
diff --git a/slobrok/src/tests/startsome/CMakeLists.txt b/slobrok/src/tests/startsome/CMakeLists.txt
index d22dc1215ee..55b82e6100b 100644
--- a/slobrok/src/tests/startsome/CMakeLists.txt
+++ b/slobrok/src/tests/startsome/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(slobrok_tstdst_app
+vespa_add_executable(slobrok_tstdst_app TEST
SOURCES
tstdst.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/array/CMakeLists.txt b/staging_vespalib/src/tests/array/CMakeLists.txt
index 7b9841d474a..139d3132e43 100644
--- a/staging_vespalib/src/tests/array/CMakeLists.txt
+++ b/staging_vespalib/src/tests/array/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(staging_vespalib_allocinarray_test_app
+vespa_add_executable(staging_vespalib_allocinarray_test_app TEST
SOURCES
allocinarray_test.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/bits/CMakeLists.txt b/staging_vespalib/src/tests/bits/CMakeLists.txt
index 693b6cbb6cc..7a0533bf230 100644
--- a/staging_vespalib/src/tests/bits/CMakeLists.txt
+++ b/staging_vespalib/src/tests/bits/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(staging_vespalib_bits_test_app
+vespa_add_executable(staging_vespalib_bits_test_app TEST
SOURCES
bits_test.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/clock/CMakeLists.txt b/staging_vespalib/src/tests/clock/CMakeLists.txt
index 8717a6411ab..9a7c5eddec3 100644
--- a/staging_vespalib/src/tests/clock/CMakeLists.txt
+++ b/staging_vespalib/src/tests/clock/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(staging_vespalib_clock_test_app
+vespa_add_executable(staging_vespalib_clock_test_app TEST
SOURCES
clock_test.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/cpu/CMakeLists.txt b/staging_vespalib/src/tests/cpu/CMakeLists.txt
index 13bc4014d85..665c662bbf2 100644
--- a/staging_vespalib/src/tests/cpu/CMakeLists.txt
+++ b/staging_vespalib/src/tests/cpu/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(staging_vespalib_cpu_test_app
+vespa_add_executable(staging_vespalib_cpu_test_app TEST
SOURCES
cpu_test.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/crc/CMakeLists.txt b/staging_vespalib/src/tests/crc/CMakeLists.txt
index cc8e828d0d4..2d5a0099fd0 100644
--- a/staging_vespalib/src/tests/crc/CMakeLists.txt
+++ b/staging_vespalib/src/tests/crc/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(staging_vespalib_crc_test_app
+vespa_add_executable(staging_vespalib_crc_test_app TEST
SOURCES
crc_test.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/databuffer/CMakeLists.txt b/staging_vespalib/src/tests/databuffer/CMakeLists.txt
index 65eae47a502..7f9ebcc3dd8 100644
--- a/staging_vespalib/src/tests/databuffer/CMakeLists.txt
+++ b/staging_vespalib/src/tests/databuffer/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(staging_vespalib_databuffer_test_app
+vespa_add_executable(staging_vespalib_databuffer_test_app TEST
SOURCES
databuffer_test.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/directio/CMakeLists.txt b/staging_vespalib/src/tests/directio/CMakeLists.txt
index 334ae825bf6..a73f34a4719 100644
--- a/staging_vespalib/src/tests/directio/CMakeLists.txt
+++ b/staging_vespalib/src/tests/directio/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(staging_vespalib_directio_test_app
+vespa_add_executable(staging_vespalib_directio_test_app TEST
SOURCES
directio.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/encoding/base64/CMakeLists.txt b/staging_vespalib/src/tests/encoding/base64/CMakeLists.txt
index bc515aa26d6..a01dad8033c 100644
--- a/staging_vespalib/src/tests/encoding/base64/CMakeLists.txt
+++ b/staging_vespalib/src/tests/encoding/base64/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(staging_vespalib_base64_test_app
+vespa_add_executable(staging_vespalib_base64_test_app TEST
SOURCES
base64_test.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/fileheader/CMakeLists.txt b/staging_vespalib/src/tests/fileheader/CMakeLists.txt
index 9e8e834147e..73f5a909abb 100644
--- a/staging_vespalib/src/tests/fileheader/CMakeLists.txt
+++ b/staging_vespalib/src/tests/fileheader/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(staging_vespalib_fileheader_test_app
+vespa_add_executable(staging_vespalib_fileheader_test_app TEST
SOURCES
fileheader_test.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/floatingpointtype/CMakeLists.txt b/staging_vespalib/src/tests/floatingpointtype/CMakeLists.txt
index 88c73073ed4..d2ba3c87ada 100644
--- a/staging_vespalib/src/tests/floatingpointtype/CMakeLists.txt
+++ b/staging_vespalib/src/tests/floatingpointtype/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(staging_vespalib_floatingpointtype_test_app
+vespa_add_executable(staging_vespalib_floatingpointtype_test_app TEST
SOURCES
floatingpointtypetest.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/growablebytebuffer/CMakeLists.txt b/staging_vespalib/src/tests/growablebytebuffer/CMakeLists.txt
index cd19f0f1256..590c14a684c 100644
--- a/staging_vespalib/src/tests/growablebytebuffer/CMakeLists.txt
+++ b/staging_vespalib/src/tests/growablebytebuffer/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(staging_vespalib_growablebytebuffer_test_app
+vespa_add_executable(staging_vespalib_growablebytebuffer_test_app TEST
SOURCES
growablebytebuffer_test.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/json/CMakeLists.txt b/staging_vespalib/src/tests/json/CMakeLists.txt
index 284e858e033..df40ec2bc5d 100644
--- a/staging_vespalib/src/tests/json/CMakeLists.txt
+++ b/staging_vespalib/src/tests/json/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(staging_vespalib_json_test_app
+vespa_add_executable(staging_vespalib_json_test_app TEST
SOURCES
json.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/librarypool/CMakeLists.txt b/staging_vespalib/src/tests/librarypool/CMakeLists.txt
index 0ef8d03ccda..c599dd54c29 100644
--- a/staging_vespalib/src/tests/librarypool/CMakeLists.txt
+++ b/staging_vespalib/src/tests/librarypool/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(staging_vespalib_librarypool_test_app
+vespa_add_executable(staging_vespalib_librarypool_test_app TEST
SOURCES
librarypool_test.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/memorydatastore/CMakeLists.txt b/staging_vespalib/src/tests/memorydatastore/CMakeLists.txt
index 386cf7d6865..24f05959a9d 100644
--- a/staging_vespalib/src/tests/memorydatastore/CMakeLists.txt
+++ b/staging_vespalib/src/tests/memorydatastore/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(staging_vespalib_memorydatastore_test_app
+vespa_add_executable(staging_vespalib_memorydatastore_test_app TEST
SOURCES
memorydatastore.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/objectdump/CMakeLists.txt b/staging_vespalib/src/tests/objectdump/CMakeLists.txt
index e8b5f76b934..e6cc957369f 100644
--- a/staging_vespalib/src/tests/objectdump/CMakeLists.txt
+++ b/staging_vespalib/src/tests/objectdump/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(staging_vespalib_objectdump_test_app
+vespa_add_executable(staging_vespalib_objectdump_test_app TEST
SOURCES
objectdump.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/objects/CMakeLists.txt b/staging_vespalib/src/tests/objects/CMakeLists.txt
index 1ef21d0aaa5..9f8739b9071 100644
--- a/staging_vespalib/src/tests/objects/CMakeLists.txt
+++ b/staging_vespalib/src/tests/objects/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(staging_vespalib_identifiable_test_app
+vespa_add_executable(staging_vespalib_identifiable_test_app TEST
SOURCES
identifiable_test.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/objectselection/CMakeLists.txt b/staging_vespalib/src/tests/objectselection/CMakeLists.txt
index 53453035267..d63c457ea27 100644
--- a/staging_vespalib/src/tests/objectselection/CMakeLists.txt
+++ b/staging_vespalib/src/tests/objectselection/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(staging_vespalib_objectselection_test_app
+vespa_add_executable(staging_vespalib_objectselection_test_app TEST
SOURCES
objectselection.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/polymorphicarray/CMakeLists.txt b/staging_vespalib/src/tests/polymorphicarray/CMakeLists.txt
index 929dd258cfe..f15e497b467 100644
--- a/staging_vespalib/src/tests/polymorphicarray/CMakeLists.txt
+++ b/staging_vespalib/src/tests/polymorphicarray/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(staging_vespalib_polymorphicarray_test_app
+vespa_add_executable(staging_vespalib_polymorphicarray_test_app TEST
SOURCES
polymorphicarray_test.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/programoptions/CMakeLists.txt b/staging_vespalib/src/tests/programoptions/CMakeLists.txt
index 7e436e7cee7..841141fb370 100644
--- a/staging_vespalib/src/tests/programoptions/CMakeLists.txt
+++ b/staging_vespalib/src/tests/programoptions/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(staging_vespalib_programoptions_test_app
+vespa_add_executable(staging_vespalib_programoptions_test_app TEST
SOURCES
programoptions_test.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/rusage/CMakeLists.txt b/staging_vespalib/src/tests/rusage/CMakeLists.txt
index b927110179e..4ebaa9657b9 100644
--- a/staging_vespalib/src/tests/rusage/CMakeLists.txt
+++ b/staging_vespalib/src/tests/rusage/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(staging_vespalib_rusage_test_app
+vespa_add_executable(staging_vespalib_rusage_test_app TEST
SOURCES
rusage_test.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/shutdownguard/CMakeLists.txt b/staging_vespalib/src/tests/shutdownguard/CMakeLists.txt
index 75093312cd3..c2d2ccdfdf8 100644
--- a/staging_vespalib/src/tests/shutdownguard/CMakeLists.txt
+++ b/staging_vespalib/src/tests/shutdownguard/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(staging_vespalib_shutdownguard_test_app
+vespa_add_executable(staging_vespalib_shutdownguard_test_app TEST
SOURCES
shutdownguard_test.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/state_server/CMakeLists.txt b/staging_vespalib/src/tests/state_server/CMakeLists.txt
index a62549a563b..635647c85b5 100644
--- a/staging_vespalib/src/tests/state_server/CMakeLists.txt
+++ b/staging_vespalib/src/tests/state_server/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(staging_vespalib_state_server_test_app
+vespa_add_executable(staging_vespalib_state_server_test_app TEST
SOURCES
state_server_test.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/stllike/CMakeLists.txt b/staging_vespalib/src/tests/stllike/CMakeLists.txt
index 690582676ad..93c5ce047d6 100644
--- a/staging_vespalib/src/tests/stllike/CMakeLists.txt
+++ b/staging_vespalib/src/tests/stllike/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(staging_vespalib_lrucache_test_app
+vespa_add_executable(staging_vespalib_lrucache_test_app TEST
SOURCES
lrucache.cpp
DEPENDS
staging_vespalib
)
vespa_add_test(NAME staging_vespalib_lrucache_test_app COMMAND staging_vespalib_lrucache_test_app)
-vespa_add_executable(staging_vespalib_cache_test_app
+vespa_add_executable(staging_vespalib_cache_test_app TEST
SOURCES
cache_test.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/timer/CMakeLists.txt b/staging_vespalib/src/tests/timer/CMakeLists.txt
index ab16cc236c4..96d306e44b9 100644
--- a/staging_vespalib/src/tests/timer/CMakeLists.txt
+++ b/staging_vespalib/src/tests/timer/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(staging_vespalib_timer_test_app
+vespa_add_executable(staging_vespalib_timer_test_app TEST
SOURCES
timer_test.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/trace/CMakeLists.txt b/staging_vespalib/src/tests/trace/CMakeLists.txt
index cb381733bff..9eeef16e6ea 100644
--- a/staging_vespalib/src/tests/trace/CMakeLists.txt
+++ b/staging_vespalib/src/tests/trace/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(staging_vespalib_trace_test_app
+vespa_add_executable(staging_vespalib_trace_test_app TEST
SOURCES
trace.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/util/process_memory_stats/CMakeLists.txt b/staging_vespalib/src/tests/util/process_memory_stats/CMakeLists.txt
index a9c23944575..bc5bb9194ff 100644
--- a/staging_vespalib/src/tests/util/process_memory_stats/CMakeLists.txt
+++ b/staging_vespalib/src/tests/util/process_memory_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(staging_vespalib_process_memory_stats_test_app
+vespa_add_executable(staging_vespalib_process_memory_stats_test_app TEST
SOURCES
process_memory_stats_test.cpp
DEPENDS
diff --git a/staging_vespalib/src/tests/xmlserializable/CMakeLists.txt b/staging_vespalib/src/tests/xmlserializable/CMakeLists.txt
index 9d351cec4d9..ce7c040163c 100644
--- a/staging_vespalib/src/tests/xmlserializable/CMakeLists.txt
+++ b/staging_vespalib/src/tests/xmlserializable/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(staging_vespalib_xmlserializable_test_app
+vespa_add_executable(staging_vespalib_xmlserializable_test_app TEST
SOURCES
xmlserializabletest.cpp
DEPENDS
diff --git a/storage/src/tests/CMakeLists.txt b/storage/src/tests/CMakeLists.txt
index 894ea7b4d25..03fbefed448 100644
--- a/storage/src/tests/CMakeLists.txt
+++ b/storage/src/tests/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(storage_testrunner_app
+vespa_add_executable(storage_testrunner_app TEST
SOURCES
testrunner.cpp
DEPENDS
diff --git a/storageapi/src/tests/CMakeLists.txt b/storageapi/src/tests/CMakeLists.txt
index eeeb701f8b5..2d98f06456d 100644
--- a/storageapi/src/tests/CMakeLists.txt
+++ b/storageapi/src/tests/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(storageapi_testrunner_app
+vespa_add_executable(storageapi_testrunner_app TEST
SOURCES
testrunner.cpp
DEPENDS
diff --git a/storageframework/src/tests/CMakeLists.txt b/storageframework/src/tests/CMakeLists.txt
index 863d5381d20..47a0a7bcc6e 100644
--- a/storageframework/src/tests/CMakeLists.txt
+++ b/storageframework/src/tests/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(storageframework_testrunner_app
+vespa_add_executable(storageframework_testrunner_app TEST
SOURCES
testrunner.cpp
DEPENDS
diff --git a/storageserver/src/tests/CMakeLists.txt b/storageserver/src/tests/CMakeLists.txt
index b735716c705..5074c434bd8 100644
--- a/storageserver/src/tests/CMakeLists.txt
+++ b/storageserver/src/tests/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(storageserver_testrunner_app
+vespa_add_executable(storageserver_testrunner_app TEST
SOURCES
storageservertest.cpp
testhelper.cpp
diff --git a/streamingvisitors/src/tests/hitcollector/CMakeLists.txt b/streamingvisitors/src/tests/hitcollector/CMakeLists.txt
index 62c481e13a7..074f6bfdf38 100644
--- a/streamingvisitors/src/tests/hitcollector/CMakeLists.txt
+++ b/streamingvisitors/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(streamingvisitors_hitcollector_test_app
+vespa_add_executable(streamingvisitors_hitcollector_test_app TEST
SOURCES
hitcollector.cpp
DEPENDS
diff --git a/streamingvisitors/src/tests/querywrapper/CMakeLists.txt b/streamingvisitors/src/tests/querywrapper/CMakeLists.txt
index 501b1eee1a9..38a419e0c02 100644
--- a/streamingvisitors/src/tests/querywrapper/CMakeLists.txt
+++ b/streamingvisitors/src/tests/querywrapper/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(streamingvisitors_querywrapper_test_app
+vespa_add_executable(streamingvisitors_querywrapper_test_app TEST
SOURCES
querywrapper.cpp
DEPENDS
diff --git a/streamingvisitors/src/tests/searchvisitor/CMakeLists.txt b/streamingvisitors/src/tests/searchvisitor/CMakeLists.txt
index 83abfde144a..d3251bac1df 100644
--- a/streamingvisitors/src/tests/searchvisitor/CMakeLists.txt
+++ b/streamingvisitors/src/tests/searchvisitor/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(streamingvisitors_searchvisitor_test_app
+vespa_add_executable(streamingvisitors_searchvisitor_test_app TEST
SOURCES
searchvisitor.cpp
DEPENDS
diff --git a/vbench/src/tests/app_dumpurl/CMakeLists.txt b/vbench/src/tests/app_dumpurl/CMakeLists.txt
index 2ff66e4edcd..d75aa9595f4 100644
--- a/vbench/src/tests/app_dumpurl/CMakeLists.txt
+++ b/vbench/src/tests/app_dumpurl/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(vbench_app_dumpurl_test_app
+vespa_add_executable(vbench_app_dumpurl_test_app TEST
SOURCES
app_dumpurl_test.cpp
DEPENDS
diff --git a/vbench/src/tests/app_vbench/CMakeLists.txt b/vbench/src/tests/app_vbench/CMakeLists.txt
index 6295571cc09..c8970393a60 100644
--- a/vbench/src/tests/app_vbench/CMakeLists.txt
+++ b/vbench/src/tests/app_vbench/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(vbench_app_vbench_test_app
+vespa_add_executable(vbench_app_vbench_test_app TEST
SOURCES
app_vbench_test.cpp
DEPENDS
diff --git a/vbench/src/tests/benchmark_headers/CMakeLists.txt b/vbench/src/tests/benchmark_headers/CMakeLists.txt
index ab8f0bce02e..4d2a3d53247 100644
--- a/vbench/src/tests/benchmark_headers/CMakeLists.txt
+++ b/vbench/src/tests/benchmark_headers/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(vbench_benchmark_headers_test_app
+vespa_add_executable(vbench_benchmark_headers_test_app TEST
SOURCES
benchmark_headers_test.cpp
DEPENDS
diff --git a/vbench/src/tests/buffered_output/CMakeLists.txt b/vbench/src/tests/buffered_output/CMakeLists.txt
index 7dfc6c326a7..c9c3386b0e4 100644
--- a/vbench/src/tests/buffered_output/CMakeLists.txt
+++ b/vbench/src/tests/buffered_output/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(vbench_buffered_output_test_app
+vespa_add_executable(vbench_buffered_output_test_app TEST
SOURCES
buffered_output_test.cpp
DEPENDS
diff --git a/vbench/src/tests/byte_input/CMakeLists.txt b/vbench/src/tests/byte_input/CMakeLists.txt
index 5838ed58d76..3c946c223b6 100644
--- a/vbench/src/tests/byte_input/CMakeLists.txt
+++ b/vbench/src/tests/byte_input/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(vbench_byte_input_test_app
+vespa_add_executable(vbench_byte_input_test_app TEST
SOURCES
byte_input_test.cpp
DEPENDS
diff --git a/vbench/src/tests/dispatcher/CMakeLists.txt b/vbench/src/tests/dispatcher/CMakeLists.txt
index 0cdc9ffb2d3..de021c35f1d 100644
--- a/vbench/src/tests/dispatcher/CMakeLists.txt
+++ b/vbench/src/tests/dispatcher/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(vbench_dispatcher_test_app
+vespa_add_executable(vbench_dispatcher_test_app TEST
SOURCES
dispatcher_test.cpp
DEPENDS
diff --git a/vbench/src/tests/dropped_tagger/CMakeLists.txt b/vbench/src/tests/dropped_tagger/CMakeLists.txt
index 2fc41839d5d..6e2e3e96c92 100644
--- a/vbench/src/tests/dropped_tagger/CMakeLists.txt
+++ b/vbench/src/tests/dropped_tagger/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(vbench_dropped_tagger_test_app
+vespa_add_executable(vbench_dropped_tagger_test_app TEST
SOURCES
dropped_tagger_test.cpp
DEPENDS
diff --git a/vbench/src/tests/handler_thread/CMakeLists.txt b/vbench/src/tests/handler_thread/CMakeLists.txt
index ee69cc594de..92fcee0399e 100644
--- a/vbench/src/tests/handler_thread/CMakeLists.txt
+++ b/vbench/src/tests/handler_thread/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(vbench_handler_thread_test_app
+vespa_add_executable(vbench_handler_thread_test_app TEST
SOURCES
handler_thread_test.cpp
DEPENDS
diff --git a/vbench/src/tests/hex_number/CMakeLists.txt b/vbench/src/tests/hex_number/CMakeLists.txt
index 37875434e5e..ed19d720b73 100644
--- a/vbench/src/tests/hex_number/CMakeLists.txt
+++ b/vbench/src/tests/hex_number/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(vbench_hex_number_test_app
+vespa_add_executable(vbench_hex_number_test_app TEST
SOURCES
hex_number_test.cpp
DEPENDS
diff --git a/vbench/src/tests/http_client/CMakeLists.txt b/vbench/src/tests/http_client/CMakeLists.txt
index 3a01f9712a3..6c6ceaaebbc 100644
--- a/vbench/src/tests/http_client/CMakeLists.txt
+++ b/vbench/src/tests/http_client/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(vbench_http_client_test_app
+vespa_add_executable(vbench_http_client_test_app TEST
SOURCES
http_client_test.cpp
DEPENDS
diff --git a/vbench/src/tests/http_connection/CMakeLists.txt b/vbench/src/tests/http_connection/CMakeLists.txt
index 8d33e8fb1e3..fc24e9a3dda 100644
--- a/vbench/src/tests/http_connection/CMakeLists.txt
+++ b/vbench/src/tests/http_connection/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(vbench_http_connection_test_app
+vespa_add_executable(vbench_http_connection_test_app TEST
SOURCES
http_connection_test.cpp
DEPENDS
diff --git a/vbench/src/tests/http_connection_pool/CMakeLists.txt b/vbench/src/tests/http_connection_pool/CMakeLists.txt
index 6ebac01b954..b22598a5eda 100644
--- a/vbench/src/tests/http_connection_pool/CMakeLists.txt
+++ b/vbench/src/tests/http_connection_pool/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(vbench_http_connection_pool_test_app
+vespa_add_executable(vbench_http_connection_pool_test_app TEST
SOURCES
http_connection_pool_test.cpp
DEPENDS
diff --git a/vbench/src/tests/input_file_reader/CMakeLists.txt b/vbench/src/tests/input_file_reader/CMakeLists.txt
index ac4ded756f9..cf565282337 100644
--- a/vbench/src/tests/input_file_reader/CMakeLists.txt
+++ b/vbench/src/tests/input_file_reader/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(vbench_input_file_reader_test_app
+vespa_add_executable(vbench_input_file_reader_test_app TEST
SOURCES
input_file_reader_test.cpp
DEPENDS
diff --git a/vbench/src/tests/latency_analyzer/CMakeLists.txt b/vbench/src/tests/latency_analyzer/CMakeLists.txt
index 01fbb5c3d5c..035744b1f18 100644
--- a/vbench/src/tests/latency_analyzer/CMakeLists.txt
+++ b/vbench/src/tests/latency_analyzer/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(vbench_latency_analyzer_test_app
+vespa_add_executable(vbench_latency_analyzer_test_app TEST
SOURCES
latency_analyzer_test.cpp
DEPENDS
diff --git a/vbench/src/tests/line_reader/CMakeLists.txt b/vbench/src/tests/line_reader/CMakeLists.txt
index 5235d4dfe12..2d610f1a6e3 100644
--- a/vbench/src/tests/line_reader/CMakeLists.txt
+++ b/vbench/src/tests/line_reader/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(vbench_line_reader_test_app
+vespa_add_executable(vbench_line_reader_test_app TEST
SOURCES
line_reader_test.cpp
DEPENDS
diff --git a/vbench/src/tests/mapped_file_input/CMakeLists.txt b/vbench/src/tests/mapped_file_input/CMakeLists.txt
index de7cbb7c89d..35132ae5845 100644
--- a/vbench/src/tests/mapped_file_input/CMakeLists.txt
+++ b/vbench/src/tests/mapped_file_input/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(vbench_mapped_file_input_test_app
+vespa_add_executable(vbench_mapped_file_input_test_app TEST
SOURCES
mapped_file_input_test.cpp
DEPENDS
diff --git a/vbench/src/tests/memory/CMakeLists.txt b/vbench/src/tests/memory/CMakeLists.txt
index bcdaf55f4a1..c2dc5b45306 100644
--- a/vbench/src/tests/memory/CMakeLists.txt
+++ b/vbench/src/tests/memory/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(vbench_memory_test_app
+vespa_add_executable(vbench_memory_test_app TEST
SOURCES
memory_test.cpp
DEPENDS
diff --git a/vbench/src/tests/qps_analyzer/CMakeLists.txt b/vbench/src/tests/qps_analyzer/CMakeLists.txt
index b4167511665..dce9b81f73f 100644
--- a/vbench/src/tests/qps_analyzer/CMakeLists.txt
+++ b/vbench/src/tests/qps_analyzer/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(vbench_qps_analyzer_test_app
+vespa_add_executable(vbench_qps_analyzer_test_app TEST
SOURCES
qps_analyzer_test.cpp
DEPENDS
diff --git a/vbench/src/tests/qps_tagger/CMakeLists.txt b/vbench/src/tests/qps_tagger/CMakeLists.txt
index 2538de07b8f..8b77947fac9 100644
--- a/vbench/src/tests/qps_tagger/CMakeLists.txt
+++ b/vbench/src/tests/qps_tagger/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(vbench_qps_tagger_test_app
+vespa_add_executable(vbench_qps_tagger_test_app TEST
SOURCES
qps_tagger_test.cpp
DEPENDS
diff --git a/vbench/src/tests/request_dumper/CMakeLists.txt b/vbench/src/tests/request_dumper/CMakeLists.txt
index 08cd6f12ebe..96841442bff 100644
--- a/vbench/src/tests/request_dumper/CMakeLists.txt
+++ b/vbench/src/tests/request_dumper/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(vbench_request_dumper_test_app
+vespa_add_executable(vbench_request_dumper_test_app TEST
SOURCES
request_dumper_test.cpp
DEPENDS
diff --git a/vbench/src/tests/request_generator/CMakeLists.txt b/vbench/src/tests/request_generator/CMakeLists.txt
index a59029055d0..b9fb23beb88 100644
--- a/vbench/src/tests/request_generator/CMakeLists.txt
+++ b/vbench/src/tests/request_generator/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(vbench_request_generator_test_app
+vespa_add_executable(vbench_request_generator_test_app TEST
SOURCES
request_generator_test.cpp
DEPENDS
diff --git a/vbench/src/tests/request_sink/CMakeLists.txt b/vbench/src/tests/request_sink/CMakeLists.txt
index 4b184c25f91..a327f4376c5 100644
--- a/vbench/src/tests/request_sink/CMakeLists.txt
+++ b/vbench/src/tests/request_sink/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(vbench_request_sink_test_app
+vespa_add_executable(vbench_request_sink_test_app TEST
SOURCES
request_sink_test.cpp
DEPENDS
diff --git a/vbench/src/tests/server_socket/CMakeLists.txt b/vbench/src/tests/server_socket/CMakeLists.txt
index 1077d7d0525..ac76763ae16 100644
--- a/vbench/src/tests/server_socket/CMakeLists.txt
+++ b/vbench/src/tests/server_socket/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(vbench_server_socket_test_app
+vespa_add_executable(vbench_server_socket_test_app TEST
SOURCES
server_socket_test.cpp
DEPENDS
diff --git a/vbench/src/tests/server_spec/CMakeLists.txt b/vbench/src/tests/server_spec/CMakeLists.txt
index a43d2c80dde..1f570bbf114 100644
--- a/vbench/src/tests/server_spec/CMakeLists.txt
+++ b/vbench/src/tests/server_spec/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(vbench_server_spec_test_app
+vespa_add_executable(vbench_server_spec_test_app TEST
SOURCES
server_spec_test.cpp
DEPENDS
diff --git a/vbench/src/tests/server_tagger/CMakeLists.txt b/vbench/src/tests/server_tagger/CMakeLists.txt
index d7cc0bdbea9..0b7b8a63e02 100644
--- a/vbench/src/tests/server_tagger/CMakeLists.txt
+++ b/vbench/src/tests/server_tagger/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(vbench_server_tagger_test_app
+vespa_add_executable(vbench_server_tagger_test_app TEST
SOURCES
server_tagger_test.cpp
DEPENDS
diff --git a/vbench/src/tests/simple_buffer/CMakeLists.txt b/vbench/src/tests/simple_buffer/CMakeLists.txt
index dd8da993c0b..97ce39faa4e 100644
--- a/vbench/src/tests/simple_buffer/CMakeLists.txt
+++ b/vbench/src/tests/simple_buffer/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(vbench_simple_buffer_test_app
+vespa_add_executable(vbench_simple_buffer_test_app TEST
SOURCES
simple_buffer_test.cpp
DEPENDS
diff --git a/vbench/src/tests/socket/CMakeLists.txt b/vbench/src/tests/socket/CMakeLists.txt
index 6ede77e5d63..543fd20466e 100644
--- a/vbench/src/tests/socket/CMakeLists.txt
+++ b/vbench/src/tests/socket/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(vbench_socket_test_app
+vespa_add_executable(vbench_socket_test_app TEST
SOURCES
socket_test.cpp
DEPENDS
diff --git a/vbench/src/tests/taint/CMakeLists.txt b/vbench/src/tests/taint/CMakeLists.txt
index 7dd23e62020..c581aa0b0c0 100644
--- a/vbench/src/tests/taint/CMakeLists.txt
+++ b/vbench/src/tests/taint/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(vbench_taint_test_app
+vespa_add_executable(vbench_taint_test_app TEST
SOURCES
taint_test.cpp
DEPENDS
diff --git a/vbench/src/tests/time_queue/CMakeLists.txt b/vbench/src/tests/time_queue/CMakeLists.txt
index a87a4c1982e..ea9df3cb12b 100644
--- a/vbench/src/tests/time_queue/CMakeLists.txt
+++ b/vbench/src/tests/time_queue/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(vbench_time_queue_test_app
+vespa_add_executable(vbench_time_queue_test_app TEST
SOURCES
time_queue_test.cpp
DEPENDS
diff --git a/vbench/src/tests/timer/CMakeLists.txt b/vbench/src/tests/timer/CMakeLists.txt
index fc50c222ba0..2e53358da47 100644
--- a/vbench/src/tests/timer/CMakeLists.txt
+++ b/vbench/src/tests/timer/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(vbench_timer_test_app
+vespa_add_executable(vbench_timer_test_app TEST
SOURCES
timer_test.cpp
DEPENDS
diff --git a/vbench/src/tests/writable_memory/CMakeLists.txt b/vbench/src/tests/writable_memory/CMakeLists.txt
index 4011ee64f63..8b480ff05af 100644
--- a/vbench/src/tests/writable_memory/CMakeLists.txt
+++ b/vbench/src/tests/writable_memory/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(vbench_writable_memory_test_app
+vespa_add_executable(vbench_writable_memory_test_app TEST
SOURCES
writable_memory_test.cpp
DEPENDS
diff --git a/vdslib/src/tests/CMakeLists.txt b/vdslib/src/tests/CMakeLists.txt
index 484ea533ccc..b5af2f05501 100644
--- a/vdslib/src/tests/CMakeLists.txt
+++ b/vdslib/src/tests/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(vdslib_testrunner_app
+vespa_add_executable(vdslib_testrunner_app TEST
SOURCES
testrunner.cpp
DEPENDS
diff --git a/vdstestlib/src/tests/cppunit/CMakeLists.txt b/vdstestlib/src/tests/cppunit/CMakeLists.txt
index 01356972a56..190ef213ca1 100644
--- a/vdstestlib/src/tests/cppunit/CMakeLists.txt
+++ b/vdstestlib/src/tests/cppunit/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(vdstestlib_testrunner_app
+vespa_add_executable(vdstestlib_testrunner_app TEST
SOURCES
testrunner.cpp
cppunittest.cpp
diff --git a/vdstestlib/src/tests/dirconfig/CMakeLists.txt b/vdstestlib/src/tests/dirconfig/CMakeLists.txt
index 1cd06c06930..12248715749 100644
--- a/vdstestlib/src/tests/dirconfig/CMakeLists.txt
+++ b/vdstestlib/src/tests/dirconfig/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(vdstestlib_dirconfig_test_app
+vespa_add_executable(vdstestlib_dirconfig_test_app TEST
SOURCES
dirconfigtest.cpp
DEPENDS
diff --git a/vespalib/src/tests/alignedmemory/CMakeLists.txt b/vespalib/src/tests/alignedmemory/CMakeLists.txt
index 685705b0761..716720e6346 100644
--- a/vespalib/src/tests/alignedmemory/CMakeLists.txt
+++ b/vespalib/src/tests/alignedmemory/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(vespalib_alignedmemory_test_app
+vespa_add_executable(vespalib_alignedmemory_test_app TEST
SOURCES
alignedmemory_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/alloc/CMakeLists.txt b/vespalib/src/tests/alloc/CMakeLists.txt
index 9b1a2493dce..b9f686363c9 100644
--- a/vespalib/src/tests/alloc/CMakeLists.txt
+++ b/vespalib/src/tests/alloc/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(vespalib_alloc_test_app
+vespa_add_executable(vespalib_alloc_test_app TEST
SOURCES
alloc_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/approx/CMakeLists.txt b/vespalib/src/tests/approx/CMakeLists.txt
index e58117c0761..ef638beade8 100644
--- a/vespalib/src/tests/approx/CMakeLists.txt
+++ b/vespalib/src/tests/approx/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(vespalib_approx_test_app
+vespa_add_executable(vespalib_approx_test_app TEST
SOURCES
approx_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/array/CMakeLists.txt b/vespalib/src/tests/array/CMakeLists.txt
index 28ebedecba0..e29e7e90796 100644
--- a/vespalib/src/tests/array/CMakeLists.txt
+++ b/vespalib/src/tests/array/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(vespalib_array_test_app
+vespa_add_executable(vespalib_array_test_app TEST
SOURCES
array_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/arrayqueue/CMakeLists.txt b/vespalib/src/tests/arrayqueue/CMakeLists.txt
index 57fd14dc536..9e9dcd59526 100644
--- a/vespalib/src/tests/arrayqueue/CMakeLists.txt
+++ b/vespalib/src/tests/arrayqueue/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(vespalib_arrayqueue_test_app
+vespa_add_executable(vespalib_arrayqueue_test_app TEST
SOURCES
arrayqueue.cpp
DEPENDS
diff --git a/vespalib/src/tests/atomic/CMakeLists.txt b/vespalib/src/tests/atomic/CMakeLists.txt
index c7cffde606c..b66413c1fa3 100644
--- a/vespalib/src/tests/atomic/CMakeLists.txt
+++ b/vespalib/src/tests/atomic/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(vespalib_atomic_test_app
+vespa_add_executable(vespalib_atomic_test_app TEST
SOURCES
atomic_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/barrier/CMakeLists.txt b/vespalib/src/tests/barrier/CMakeLists.txt
index db0e98b04c5..42d41c140e4 100644
--- a/vespalib/src/tests/barrier/CMakeLists.txt
+++ b/vespalib/src/tests/barrier/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(vespalib_barrier_test_app
+vespa_add_executable(vespalib_barrier_test_app TEST
SOURCES
barrier_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/box/CMakeLists.txt b/vespalib/src/tests/box/CMakeLists.txt
index c115383fcd2..a8df84f5cc1 100644
--- a/vespalib/src/tests/box/CMakeLists.txt
+++ b/vespalib/src/tests/box/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(vespalib_box_test_app
+vespa_add_executable(vespalib_box_test_app TEST
SOURCES
box_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/closure/CMakeLists.txt b/vespalib/src/tests/closure/CMakeLists.txt
index 174c1e8700b..cf744fc3bd9 100644
--- a/vespalib/src/tests/closure/CMakeLists.txt
+++ b/vespalib/src/tests/closure/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(vespalib_closure_test_app
+vespa_add_executable(vespalib_closure_test_app TEST
SOURCES
closure_test.cpp
DEPENDS
vespalib
)
vespa_add_test(NAME vespalib_closure_test_app COMMAND vespalib_closure_test_app)
-vespa_add_executable(vespalib_autoclosurecaller_test_app
+vespa_add_executable(vespalib_autoclosurecaller_test_app TEST
SOURCES
autoclosurecaller_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/component/CMakeLists.txt b/vespalib/src/tests/component/CMakeLists.txt
index 0f30f398db2..5a0c46b27bc 100644
--- a/vespalib/src/tests/component/CMakeLists.txt
+++ b/vespalib/src/tests/component/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(vespalib_component_test_app
+vespa_add_executable(vespalib_component_test_app TEST
SOURCES
component.cpp
DEPENDS
diff --git a/vespalib/src/tests/compress/CMakeLists.txt b/vespalib/src/tests/compress/CMakeLists.txt
index eb6c403f1d9..5988ba94840 100644
--- a/vespalib/src/tests/compress/CMakeLists.txt
+++ b/vespalib/src/tests/compress/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(vespalib_compress_test_app
+vespa_add_executable(vespalib_compress_test_app TEST
SOURCES
compress_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/delegatelist/CMakeLists.txt b/vespalib/src/tests/delegatelist/CMakeLists.txt
index ad7d22a2ceb..ebbfbb23830 100644
--- a/vespalib/src/tests/delegatelist/CMakeLists.txt
+++ b/vespalib/src/tests/delegatelist/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(vespalib_delegatelist_test_app
+vespa_add_executable(vespalib_delegatelist_test_app TEST
SOURCES
delegatelist.cpp
DEPENDS
diff --git a/vespalib/src/tests/dual_merge_director/CMakeLists.txt b/vespalib/src/tests/dual_merge_director/CMakeLists.txt
index 8ea80b46320..b2e9bcb941b 100644
--- a/vespalib/src/tests/dual_merge_director/CMakeLists.txt
+++ b/vespalib/src/tests/dual_merge_director/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(vespalib_dual_merge_director_test_app
+vespa_add_executable(vespalib_dual_merge_director_test_app TEST
SOURCES
dual_merge_director_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/eval/compile_cache/CMakeLists.txt b/vespalib/src/tests/eval/compile_cache/CMakeLists.txt
index 7fbadc3410b..21edf07e638 100644
--- a/vespalib/src/tests/eval/compile_cache/CMakeLists.txt
+++ b/vespalib/src/tests/eval/compile_cache/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(vespalib_compile_cache_test_app
+vespa_add_executable(vespalib_compile_cache_test_app TEST
SOURCES
compile_cache_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/eval/compiled_function/CMakeLists.txt b/vespalib/src/tests/eval/compiled_function/CMakeLists.txt
index 04ec6aa3df0..ca947ab6fd3 100644
--- a/vespalib/src/tests/eval/compiled_function/CMakeLists.txt
+++ b/vespalib/src/tests/eval/compiled_function/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(vespalib_compiled_function_test_app
+vespa_add_executable(vespalib_compiled_function_test_app TEST
SOURCES
compiled_function_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/eval/function/CMakeLists.txt b/vespalib/src/tests/eval/function/CMakeLists.txt
index 2f1d2718a2a..7c7268eb492 100644
--- a/vespalib/src/tests/eval/function/CMakeLists.txt
+++ b/vespalib/src/tests/eval/function/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(vespalib_function_test_app
+vespa_add_executable(vespalib_function_test_app TEST
SOURCES
function_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/eval/function_speed/CMakeLists.txt b/vespalib/src/tests/eval/function_speed/CMakeLists.txt
index 2c062118136..629d3dad483 100644
--- a/vespalib/src/tests/eval/function_speed/CMakeLists.txt
+++ b/vespalib/src/tests/eval/function_speed/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(vespalib_function_speed_test_app
+vespa_add_executable(vespalib_function_speed_test_app TEST
SOURCES
function_speed_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/eval/gbdt/CMakeLists.txt b/vespalib/src/tests/eval/gbdt/CMakeLists.txt
index b6328900258..c68614a5911 100644
--- a/vespalib/src/tests/eval/gbdt/CMakeLists.txt
+++ b/vespalib/src/tests/eval/gbdt/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(vespalib_gbdt_test_app
+vespa_add_executable(vespalib_gbdt_test_app TEST
SOURCES
gbdt_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/eval/interpreted_function/CMakeLists.txt b/vespalib/src/tests/eval/interpreted_function/CMakeLists.txt
index 0a9010dff05..09d7ce7364b 100644
--- a/vespalib/src/tests/eval/interpreted_function/CMakeLists.txt
+++ b/vespalib/src/tests/eval/interpreted_function/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(vespalib_interpreted_function_test_app
+vespa_add_executable(vespalib_interpreted_function_test_app TEST
SOURCES
interpreted_function_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/eval/node_types/CMakeLists.txt b/vespalib/src/tests/eval/node_types/CMakeLists.txt
index 5aeb5aa242c..2471815fa51 100644
--- a/vespalib/src/tests/eval/node_types/CMakeLists.txt
+++ b/vespalib/src/tests/eval/node_types/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(vespalib_node_types_test_app
+vespa_add_executable(vespalib_node_types_test_app TEST
SOURCES
node_types_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/eval/simple_tensor/CMakeLists.txt b/vespalib/src/tests/eval/simple_tensor/CMakeLists.txt
index 6fd9b8173be..cbd65296abc 100644
--- a/vespalib/src/tests/eval/simple_tensor/CMakeLists.txt
+++ b/vespalib/src/tests/eval/simple_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(vespalib_simple_tensor_test_app
+vespa_add_executable(vespalib_simple_tensor_test_app TEST
SOURCES
simple_tensor_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/eval/tensor/CMakeLists.txt b/vespalib/src/tests/eval/tensor/CMakeLists.txt
index f5749b036f2..5a84d73f3a3 100644
--- a/vespalib/src/tests/eval/tensor/CMakeLists.txt
+++ b/vespalib/src/tests/eval/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(vespalib_eval_tensor_test_app
+vespa_add_executable(vespalib_eval_tensor_test_app TEST
SOURCES
eval_tensor_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/eval/value_type/CMakeLists.txt b/vespalib/src/tests/eval/value_type/CMakeLists.txt
index 67b31834414..c6ef9f61359 100644
--- a/vespalib/src/tests/eval/value_type/CMakeLists.txt
+++ b/vespalib/src/tests/eval/value_type/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(vespalib_value_type_test_app
+vespa_add_executable(vespalib_value_type_test_app TEST
SOURCES
value_type_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/eventbarrier/CMakeLists.txt b/vespalib/src/tests/eventbarrier/CMakeLists.txt
index ce50f024445..a9fbf83b847 100644
--- a/vespalib/src/tests/eventbarrier/CMakeLists.txt
+++ b/vespalib/src/tests/eventbarrier/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(vespalib_eventbarrier_test_app
+vespa_add_executable(vespalib_eventbarrier_test_app TEST
SOURCES
eventbarrier.cpp
DEPENDS
diff --git a/vespalib/src/tests/exception_classes/CMakeLists.txt b/vespalib/src/tests/exception_classes/CMakeLists.txt
index 928200be5c7..691ebc1daea 100644
--- a/vespalib/src/tests/exception_classes/CMakeLists.txt
+++ b/vespalib/src/tests/exception_classes/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(vespalib_exception_classes_test_app
+vespa_add_executable(vespalib_exception_classes_test_app TEST
SOURCES
exception_classes_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/executor/CMakeLists.txt b/vespalib/src/tests/executor/CMakeLists.txt
index 5b5ab2ab169..0745c7523b1 100644
--- a/vespalib/src/tests/executor/CMakeLists.txt
+++ b/vespalib/src/tests/executor/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(vespalib_threadstackexecutor_test_app
+vespa_add_executable(vespalib_threadstackexecutor_test_app TEST
SOURCES
threadstackexecutor_test.cpp
DEPENDS
vespalib
)
vespa_add_test(NAME vespalib_threadstackexecutor_test_app COMMAND vespalib_threadstackexecutor_test_app)
-vespa_add_executable(vespalib_executor_test_app
+vespa_add_executable(vespalib_executor_test_app TEST
SOURCES
executor_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/explore_modern_cpp/CMakeLists.txt b/vespalib/src/tests/explore_modern_cpp/CMakeLists.txt
index d2406224a05..c9b6598d6c7 100644
--- a/vespalib/src/tests/explore_modern_cpp/CMakeLists.txt
+++ b/vespalib/src/tests/explore_modern_cpp/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(vespalib_explore_modern_cpp_test_app
+vespa_add_executable(vespalib_explore_modern_cpp_test_app TEST
SOURCES
explore_modern_cpp_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/fiddle/CMakeLists.txt b/vespalib/src/tests/fiddle/CMakeLists.txt
index a110209846d..456396b9726 100644
--- a/vespalib/src/tests/fiddle/CMakeLists.txt
+++ b/vespalib/src/tests/fiddle/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(vespalib_fiddle_test_app
+vespa_add_executable(vespalib_fiddle_test_app TEST
SOURCES
fiddle_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/gencnt/CMakeLists.txt b/vespalib/src/tests/gencnt/CMakeLists.txt
index ddacebae09f..cefdfd2e7d6 100644
--- a/vespalib/src/tests/gencnt/CMakeLists.txt
+++ b/vespalib/src/tests/gencnt/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(vespalib_gencnt_test_app
+vespa_add_executable(vespalib_gencnt_test_app TEST
SOURCES
gencnt_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/guard/CMakeLists.txt b/vespalib/src/tests/guard/CMakeLists.txt
index dc4ba9fcd64..053f18843a6 100644
--- a/vespalib/src/tests/guard/CMakeLists.txt
+++ b/vespalib/src/tests/guard/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(vespalib_guard_test_app
+vespa_add_executable(vespalib_guard_test_app TEST
SOURCES
guard_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/hashmap/CMakeLists.txt b/vespalib/src/tests/hashmap/CMakeLists.txt
index 78696f99454..c66e21b1118 100644
--- a/vespalib/src/tests/hashmap/CMakeLists.txt
+++ b/vespalib/src/tests/hashmap/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(vespalib_hashmap_test_app
+vespa_add_executable(vespalib_hashmap_test_app TEST
SOURCES
hashmap_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/host_name/CMakeLists.txt b/vespalib/src/tests/host_name/CMakeLists.txt
index 79c2657b839..6be4faf7ffc 100644
--- a/vespalib/src/tests/host_name/CMakeLists.txt
+++ b/vespalib/src/tests/host_name/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(vespalib_host_name_test_app
+vespa_add_executable(vespalib_host_name_test_app TEST
SOURCES
host_name_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/io/fileutil/CMakeLists.txt b/vespalib/src/tests/io/fileutil/CMakeLists.txt
index 2b6af2f2dce..7b0344f49b5 100644
--- a/vespalib/src/tests/io/fileutil/CMakeLists.txt
+++ b/vespalib/src/tests/io/fileutil/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(vespalib_fileutil_test_app
+vespa_add_executable(vespalib_fileutil_test_app TEST
SOURCES
fileutiltest.cpp
DEPENDS
diff --git a/vespalib/src/tests/left_right_heap/CMakeLists.txt b/vespalib/src/tests/left_right_heap/CMakeLists.txt
index 2681cfae637..ec23b97c267 100644
--- a/vespalib/src/tests/left_right_heap/CMakeLists.txt
+++ b/vespalib/src/tests/left_right_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(vespalib_left_right_heap_test_app
+vespa_add_executable(vespalib_left_right_heap_test_app TEST
SOURCES
left_right_heap_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/linkedptr/CMakeLists.txt b/vespalib/src/tests/linkedptr/CMakeLists.txt
index c907417e432..671ebdd1bc4 100644
--- a/vespalib/src/tests/linkedptr/CMakeLists.txt
+++ b/vespalib/src/tests/linkedptr/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(vespalib_linkedptr_test_app
+vespa_add_executable(vespalib_linkedptr_test_app TEST
SOURCES
linkedptr_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/make_fixture_macros/CMakeLists.txt b/vespalib/src/tests/make_fixture_macros/CMakeLists.txt
index 3ef3d15e6c5..10d1615b0c9 100644
--- a/vespalib/src/tests/make_fixture_macros/CMakeLists.txt
+++ b/vespalib/src/tests/make_fixture_macros/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(vespalib_make_fixture_macros_test_app
+vespa_add_executable(vespalib_make_fixture_macros_test_app TEST
SOURCES
make_fixture_macros_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/memory/CMakeLists.txt b/vespalib/src/tests/memory/CMakeLists.txt
index f2521f000f0..dddf58d88f2 100644
--- a/vespalib/src/tests/memory/CMakeLists.txt
+++ b/vespalib/src/tests/memory/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(vespalib_memory_test_app
+vespa_add_executable(vespalib_memory_test_app TEST
SOURCES
memory_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/net/socket/CMakeLists.txt b/vespalib/src/tests/net/socket/CMakeLists.txt
index 16fce4a2453..e7ceac5dd45 100644
--- a/vespalib/src/tests/net/socket/CMakeLists.txt
+++ b/vespalib/src/tests/net/socket/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(vespalib_socket_test_app
+vespa_add_executable(vespalib_socket_test_app TEST
SOURCES
socket_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/objects/nbostream/CMakeLists.txt b/vespalib/src/tests/objects/nbostream/CMakeLists.txt
index 63be798a751..1a4dcdf9271 100644
--- a/vespalib/src/tests/objects/nbostream/CMakeLists.txt
+++ b/vespalib/src/tests/objects/nbostream/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(vespalib_nbostream_test_app
+vespa_add_executable(vespalib_nbostream_test_app TEST
SOURCES
nbostream_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/optimized/CMakeLists.txt b/vespalib/src/tests/optimized/CMakeLists.txt
index 627a3ceb77c..e4ff19d8cb0 100644
--- a/vespalib/src/tests/optimized/CMakeLists.txt
+++ b/vespalib/src/tests/optimized/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(vespalib_optimized_test_app
+vespa_add_executable(vespalib_optimized_test_app TEST
SOURCES
optimized_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/placement-delete/CMakeLists.txt b/vespalib/src/tests/placement-delete/CMakeLists.txt
index 289d5331a14..74c4a431958 100644
--- a/vespalib/src/tests/placement-delete/CMakeLists.txt
+++ b/vespalib/src/tests/placement-delete/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(vespalib_placement-delete_test_app
+vespa_add_executable(vespalib_placement-delete_test_app TEST
SOURCES
placement-delete.cpp
DEPENDS
diff --git a/vespalib/src/tests/printable/CMakeLists.txt b/vespalib/src/tests/printable/CMakeLists.txt
index 3aedbe7c011..dfdd0cd7b63 100644
--- a/vespalib/src/tests/printable/CMakeLists.txt
+++ b/vespalib/src/tests/printable/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(vespalib_printabletest_app
+vespa_add_executable(vespalib_printabletest_app TEST
SOURCES
printabletest.cpp
DEPENDS
diff --git a/vespalib/src/tests/priority_queue/CMakeLists.txt b/vespalib/src/tests/priority_queue/CMakeLists.txt
index cd564bab0a1..f516e9f9e03 100644
--- a/vespalib/src/tests/priority_queue/CMakeLists.txt
+++ b/vespalib/src/tests/priority_queue/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(vespalib_priority_queue_test_app
+vespa_add_executable(vespalib_priority_queue_test_app TEST
SOURCES
priority_queue_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/random/CMakeLists.txt b/vespalib/src/tests/random/CMakeLists.txt
index 52c25dbdf07..d46faa7688c 100644
--- a/vespalib/src/tests/random/CMakeLists.txt
+++ b/vespalib/src/tests/random/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(vespalib_random_test_app
+vespa_add_executable(vespalib_random_test_app TEST
SOURCES
random_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/referencecounter/CMakeLists.txt b/vespalib/src/tests/referencecounter/CMakeLists.txt
index 4a259f9a4d3..f1ae8ddca0e 100644
--- a/vespalib/src/tests/referencecounter/CMakeLists.txt
+++ b/vespalib/src/tests/referencecounter/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(vespalib_referencecounter_test_app
+vespa_add_executable(vespalib_referencecounter_test_app TEST
SOURCES
referencecounter_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/regex/CMakeLists.txt b/vespalib/src/tests/regex/CMakeLists.txt
index a1fcc2c5bdf..1555e646948 100644
--- a/vespalib/src/tests/regex/CMakeLists.txt
+++ b/vespalib/src/tests/regex/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(vespalib_regex_test_app
+vespa_add_executable(vespalib_regex_test_app TEST
SOURCES
regex.cpp
DEPENDS
diff --git a/vespalib/src/tests/rendezvous/CMakeLists.txt b/vespalib/src/tests/rendezvous/CMakeLists.txt
index f99ff6ab175..9687ce86e56 100644
--- a/vespalib/src/tests/rendezvous/CMakeLists.txt
+++ b/vespalib/src/tests/rendezvous/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(vespalib_rendezvous_test_app
+vespa_add_executable(vespalib_rendezvous_test_app TEST
SOURCES
rendezvous_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/runnable_pair/CMakeLists.txt b/vespalib/src/tests/runnable_pair/CMakeLists.txt
index 15374cd7993..f5fb8509d30 100644
--- a/vespalib/src/tests/runnable_pair/CMakeLists.txt
+++ b/vespalib/src/tests/runnable_pair/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(vespalib_runnable_pair_test_app
+vespa_add_executable(vespalib_runnable_pair_test_app TEST
SOURCES
runnable_pair_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/rwlock/CMakeLists.txt b/vespalib/src/tests/rwlock/CMakeLists.txt
index bc769c78c3d..19214dbc7ae 100644
--- a/vespalib/src/tests/rwlock/CMakeLists.txt
+++ b/vespalib/src/tests/rwlock/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(vespalib_rwlock_test_app
+vespa_add_executable(vespalib_rwlock_test_app TEST
SOURCES
rwlock_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/sha1/CMakeLists.txt b/vespalib/src/tests/sha1/CMakeLists.txt
index 17f2fd40072..0dba1ebc6db 100644
--- a/vespalib/src/tests/sha1/CMakeLists.txt
+++ b/vespalib/src/tests/sha1/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(vespalib_sha1_test_app
+vespa_add_executable(vespalib_sha1_test_app TEST
SOURCES
sha1_test.cpp
rfc_sha1.cpp
diff --git a/vespalib/src/tests/sharedptr/CMakeLists.txt b/vespalib/src/tests/sharedptr/CMakeLists.txt
index 78684d3ad51..c3b59b9bbf8 100644
--- a/vespalib/src/tests/sharedptr/CMakeLists.txt
+++ b/vespalib/src/tests/sharedptr/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(vespalib_ptrholder_test_app
+vespa_add_executable(vespalib_ptrholder_test_app TEST
SOURCES
ptrholder.cpp
DEPENDS
diff --git a/vespalib/src/tests/signalhandler/CMakeLists.txt b/vespalib/src/tests/signalhandler/CMakeLists.txt
index 20339d16ebe..5dddc1b96ee 100644
--- a/vespalib/src/tests/signalhandler/CMakeLists.txt
+++ b/vespalib/src/tests/signalhandler/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(vespalib_signalhandler_test_app
+vespa_add_executable(vespalib_signalhandler_test_app TEST
SOURCES
signalhandler_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/simple_thread_bundle/CMakeLists.txt b/vespalib/src/tests/simple_thread_bundle/CMakeLists.txt
index 7f3fbd9e014..8c9efbf4300 100644
--- a/vespalib/src/tests/simple_thread_bundle/CMakeLists.txt
+++ b/vespalib/src/tests/simple_thread_bundle/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(vespalib_simple_thread_bundle_test_app
+vespa_add_executable(vespalib_simple_thread_bundle_test_app TEST
SOURCES
simple_thread_bundle_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/slaveproc/CMakeLists.txt b/vespalib/src/tests/slaveproc/CMakeLists.txt
index 7a834bc0962..b71fa00760c 100644
--- a/vespalib/src/tests/slaveproc/CMakeLists.txt
+++ b/vespalib/src/tests/slaveproc/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(vespalib_slaveproc_test_app
+vespa_add_executable(vespalib_slaveproc_test_app TEST
SOURCES
slaveproc_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/slime/CMakeLists.txt b/vespalib/src/tests/slime/CMakeLists.txt
index 65d28337928..3debed06a27 100644
--- a/vespalib/src/tests/slime/CMakeLists.txt
+++ b/vespalib/src/tests/slime/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(vespalib_slime_test_app
+vespa_add_executable(vespalib_slime_test_app TEST
SOURCES
slime_test.cpp
DEPENDS
vespalib
)
vespa_add_test(NAME vespalib_slime_test_app COMMAND vespalib_slime_test_app)
-vespa_add_executable(vespalib_slime_inject_test_app
+vespa_add_executable(vespalib_slime_inject_test_app TEST
SOURCES
slime_inject_test.cpp
DEPENDS
vespalib
)
vespa_add_test(NAME vespalib_slime_inject_test_app COMMAND vespalib_slime_inject_test_app)
-vespa_add_executable(vespalib_slime_binary_format_test_app
+vespa_add_executable(vespalib_slime_binary_format_test_app TEST
SOURCES
slime_binary_format_test.cpp
type_traits.cpp
@@ -21,7 +21,7 @@ vespa_add_executable(vespalib_slime_binary_format_test_app
vespalib
)
vespa_add_test(NAME vespalib_slime_binary_format_test_app COMMAND vespalib_slime_binary_format_test_app)
-vespa_add_executable(vespalib_slime_json_format_test_app
+vespa_add_executable(vespalib_slime_json_format_test_app TEST
SOURCES
slime_json_format_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/stash/CMakeLists.txt b/vespalib/src/tests/stash/CMakeLists.txt
index 68da4f2bfbf..10049730412 100644
--- a/vespalib/src/tests/stash/CMakeLists.txt
+++ b/vespalib/src/tests/stash/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(vespalib_stash_test_app
+vespa_add_executable(vespalib_stash_test_app TEST
SOURCES
stash.cpp
DEPENDS
diff --git a/vespalib/src/tests/stllike/CMakeLists.txt b/vespalib/src/tests/stllike/CMakeLists.txt
index 2753a167f72..0d8685b2639 100644
--- a/vespalib/src/tests/stllike/CMakeLists.txt
+++ b/vespalib/src/tests/stllike/CMakeLists.txt
@@ -1,33 +1,33 @@
# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(vespalib_hash_test_app
+vespa_add_executable(vespalib_hash_test_app TEST
SOURCES
hash_test.cpp
DEPENDS
vespalib
)
vespa_add_test(NAME vespalib_hash_test_app COMMAND vespalib_hash_test_app)
-vespa_add_executable(vespalib_string_test_app
+vespa_add_executable(vespalib_string_test_app TEST
SOURCES
string_test.cpp
DEPENDS
vespalib
)
vespa_add_test(NAME vespalib_string_test_app COMMAND vespalib_string_test_app)
-vespa_add_executable(vespalib_vector_map_test_app
+vespa_add_executable(vespalib_vector_map_test_app TEST
SOURCES
vector_map_test.cpp
DEPENDS
vespalib
)
vespa_add_test(NAME vespalib_vector_map_test_app COMMAND vespalib_vector_map_test_app)
-vespa_add_executable(vespalib_asciistream_test_app
+vespa_add_executable(vespalib_asciistream_test_app TEST
SOURCES
asciistream_test.cpp
DEPENDS
vespalib
)
vespa_add_test(NAME vespalib_asciistream_test_app COMMAND vespalib_asciistream_test_app)
-vespa_add_executable(vespalib_hashtable_test_app
+vespa_add_executable(vespalib_hashtable_test_app TEST
SOURCES
hashtable_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/stringfmt/CMakeLists.txt b/vespalib/src/tests/stringfmt/CMakeLists.txt
index 174e45545ac..e86836b7577 100644
--- a/vespalib/src/tests/stringfmt/CMakeLists.txt
+++ b/vespalib/src/tests/stringfmt/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(vespalib_stringfmt_test_app
+vespa_add_executable(vespalib_stringfmt_test_app TEST
SOURCES
fmt.cpp
DEPENDS
diff --git a/vespalib/src/tests/sync/CMakeLists.txt b/vespalib/src/tests/sync/CMakeLists.txt
index 944d9d76337..fb361c7abb8 100644
--- a/vespalib/src/tests/sync/CMakeLists.txt
+++ b/vespalib/src/tests/sync/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(vespalib_sync_test_app
+vespa_add_executable(vespalib_sync_test_app TEST
SOURCES
sync_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/tensor/compact_tensor_builder/CMakeLists.txt b/vespalib/src/tests/tensor/compact_tensor_builder/CMakeLists.txt
index bc6a2bfe981..b19fdf2f296 100644
--- a/vespalib/src/tests/tensor/compact_tensor_builder/CMakeLists.txt
+++ b/vespalib/src/tests/tensor/compact_tensor_builder/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(vespalib_compact_tensor_builder_test_app
+vespa_add_executable(vespalib_compact_tensor_builder_test_app TEST
SOURCES
compact_tensor_builder_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/tensor/compact_tensor_v2_builder/CMakeLists.txt b/vespalib/src/tests/tensor/compact_tensor_v2_builder/CMakeLists.txt
index 820db2fbc0c..978e2f9142a 100644
--- a/vespalib/src/tests/tensor/compact_tensor_v2_builder/CMakeLists.txt
+++ b/vespalib/src/tests/tensor/compact_tensor_v2_builder/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(vespalib_compact_tensor_v2_builder_test_app
+vespa_add_executable(vespalib_compact_tensor_v2_builder_test_app TEST
SOURCES
compact_tensor_v2_builder_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/tensor/dense_tensor_builder/CMakeLists.txt b/vespalib/src/tests/tensor/dense_tensor_builder/CMakeLists.txt
index 0be94792298..ffccbf52ec6 100644
--- a/vespalib/src/tests/tensor/dense_tensor_builder/CMakeLists.txt
+++ b/vespalib/src/tests/tensor/dense_tensor_builder/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(vespalib_dense_tensor_builder_test_app
+vespa_add_executable(vespalib_dense_tensor_builder_test_app TEST
SOURCES
dense_tensor_builder_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/tensor/dense_tensor_operations/CMakeLists.txt b/vespalib/src/tests/tensor/dense_tensor_operations/CMakeLists.txt
index 800ffeeccc9..2b23b2d5120 100644
--- a/vespalib/src/tests/tensor/dense_tensor_operations/CMakeLists.txt
+++ b/vespalib/src/tests/tensor/dense_tensor_operations/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(vespalib_dense_tensor_operations_test_app
+vespa_add_executable(vespalib_dense_tensor_operations_test_app TEST
SOURCES
dense_tensor_operations_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/tensor/join_tensor_addresses/CMakeLists.txt b/vespalib/src/tests/tensor/join_tensor_addresses/CMakeLists.txt
index c03137947fe..9b59c1de09a 100644
--- a/vespalib/src/tests/tensor/join_tensor_addresses/CMakeLists.txt
+++ b/vespalib/src/tests/tensor/join_tensor_addresses/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(vespalib_join_tensor_addresses_test_app
+vespa_add_executable(vespalib_join_tensor_addresses_test_app TEST
SOURCES
join_tensor_addresses_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/tensor/simple_tensor_builder/CMakeLists.txt b/vespalib/src/tests/tensor/simple_tensor_builder/CMakeLists.txt
index e41866c9589..986492a8d37 100644
--- a/vespalib/src/tests/tensor/simple_tensor_builder/CMakeLists.txt
+++ b/vespalib/src/tests/tensor/simple_tensor_builder/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(vespalib_simple_tensor_builder_test_app
+vespa_add_executable(vespalib_simple_tensor_builder_test_app TEST
SOURCES
simple_tensor_builder_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/tensor/tensor/CMakeLists.txt b/vespalib/src/tests/tensor/tensor/CMakeLists.txt
index 6e76b1a322d..b6d2ae2f5ee 100644
--- a/vespalib/src/tests/tensor/tensor/CMakeLists.txt
+++ b/vespalib/src/tests/tensor/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(vespalib_tensor_test_app
+vespa_add_executable(vespalib_tensor_test_app TEST
SOURCES
tensor_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/tensor/tensor_address/CMakeLists.txt b/vespalib/src/tests/tensor/tensor_address/CMakeLists.txt
index ecd3bf8898b..7ea369549da 100644
--- a/vespalib/src/tests/tensor/tensor_address/CMakeLists.txt
+++ b/vespalib/src/tests/tensor/tensor_address/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(vespalib_tensor_address_test_app
+vespa_add_executable(vespalib_tensor_address_test_app TEST
SOURCES
tensor_address_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/tensor/tensor_address_element_iterator/CMakeLists.txt b/vespalib/src/tests/tensor/tensor_address_element_iterator/CMakeLists.txt
index fd923f3ce4c..59a07942600 100644
--- a/vespalib/src/tests/tensor/tensor_address_element_iterator/CMakeLists.txt
+++ b/vespalib/src/tests/tensor/tensor_address_element_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(vespalib_tensor_address_element_iterator_test_app
+vespa_add_executable(vespalib_tensor_address_element_iterator_test_app TEST
SOURCES
tensor_address_element_iterator_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/tensor/tensor_function/CMakeLists.txt b/vespalib/src/tests/tensor/tensor_function/CMakeLists.txt
index 944fa7d28f5..f849258d900 100644
--- a/vespalib/src/tests/tensor/tensor_function/CMakeLists.txt
+++ b/vespalib/src/tests/tensor/tensor_function/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(vespalib_tensor_function_test_app
+vespa_add_executable(vespalib_tensor_function_test_app TEST
SOURCES
tensor_function_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/tensor/tensor_mapper/CMakeLists.txt b/vespalib/src/tests/tensor/tensor_mapper/CMakeLists.txt
index 62216540417..91e0a185a3a 100644
--- a/vespalib/src/tests/tensor/tensor_mapper/CMakeLists.txt
+++ b/vespalib/src/tests/tensor/tensor_mapper/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(vespalib_tensor_mapper_test_app
+vespa_add_executable(vespalib_tensor_mapper_test_app TEST
SOURCES
tensor_mapper_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/tensor/tensor_operations/CMakeLists.txt b/vespalib/src/tests/tensor/tensor_operations/CMakeLists.txt
index d9d688dc82d..7bf856d388e 100644
--- a/vespalib/src/tests/tensor/tensor_operations/CMakeLists.txt
+++ b/vespalib/src/tests/tensor/tensor_operations/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(vespalib_tensor_operations_test_app
+vespa_add_executable(vespalib_tensor_operations_test_app TEST
SOURCES
tensor_operations_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/tensor/tensor_performance/CMakeLists.txt b/vespalib/src/tests/tensor/tensor_performance/CMakeLists.txt
index cda4e309497..8dd2bc72d61 100644
--- a/vespalib/src/tests/tensor/tensor_performance/CMakeLists.txt
+++ b/vespalib/src/tests/tensor/tensor_performance/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(vespalib_tensor_performance_test_app
+vespa_add_executable(vespalib_tensor_performance_test_app TEST
SOURCES
tensor_performance_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/tensor/tensor_serialization/CMakeLists.txt b/vespalib/src/tests/tensor/tensor_serialization/CMakeLists.txt
index cc1ff3ecc43..e0e64b12e7f 100644
--- a/vespalib/src/tests/tensor/tensor_serialization/CMakeLists.txt
+++ b/vespalib/src/tests/tensor/tensor_serialization/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(vespalib_tensor_serialization_test_app
+vespa_add_executable(vespalib_tensor_serialization_test_app TEST
SOURCES
tensor_serialization_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/tensor/tensor_slime_serialization/CMakeLists.txt b/vespalib/src/tests/tensor/tensor_slime_serialization/CMakeLists.txt
index 51e68c26d2d..e002450f280 100644
--- a/vespalib/src/tests/tensor/tensor_slime_serialization/CMakeLists.txt
+++ b/vespalib/src/tests/tensor/tensor_slime_serialization/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(vespalib_tensor_slime_serialization_test_app
+vespa_add_executable(vespalib_tensor_slime_serialization_test_app TEST
SOURCES
tensor_slime_serialization_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/tensor/tensor_type/CMakeLists.txt b/vespalib/src/tests/tensor/tensor_type/CMakeLists.txt
index 29f7231683c..feaa7a20c3c 100644
--- a/vespalib/src/tests/tensor/tensor_type/CMakeLists.txt
+++ b/vespalib/src/tests/tensor/tensor_type/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(vespalib_tensor_type_test_app
+vespa_add_executable(vespalib_tensor_type_test_app TEST
SOURCES
tensor_type_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/testapp-debug/CMakeLists.txt b/vespalib/src/tests/testapp-debug/CMakeLists.txt
index 7102162f76f..abbb3159545 100644
--- a/vespalib/src/tests/testapp-debug/CMakeLists.txt
+++ b/vespalib/src/tests/testapp-debug/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(vespalib_testapp-debug_test_app
+vespa_add_executable(vespalib_testapp-debug_test_app TEST
SOURCES
testapp-debug.cpp
DEPENDS
diff --git a/vespalib/src/tests/testapp-generic/CMakeLists.txt b/vespalib/src/tests/testapp-generic/CMakeLists.txt
index 109af28225b..e2c63f01185 100644
--- a/vespalib/src/tests/testapp-generic/CMakeLists.txt
+++ b/vespalib/src/tests/testapp-generic/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(vespalib_testapp-generic_test_app
+vespa_add_executable(vespalib_testapp-generic_test_app TEST
SOURCES
testapp-generic.cpp
DEPENDS
diff --git a/vespalib/src/tests/testapp-main/CMakeLists.txt b/vespalib/src/tests/testapp-main/CMakeLists.txt
index 8aeb28e975d..e1bed92b86f 100644
--- a/vespalib/src/tests/testapp-main/CMakeLists.txt
+++ b/vespalib/src/tests/testapp-main/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(vespalib_testapp-main_test_app
+vespa_add_executable(vespalib_testapp-main_test_app TEST
SOURCES
testapp-main_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/testapp-state/CMakeLists.txt b/vespalib/src/tests/testapp-state/CMakeLists.txt
index 0fa88d7ddd2..9fcac59d202 100644
--- a/vespalib/src/tests/testapp-state/CMakeLists.txt
+++ b/vespalib/src/tests/testapp-state/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(vespalib_testapp-state_test_app
+vespa_add_executable(vespalib_testapp-state_test_app TEST
SOURCES
testapp-state.cpp
DEPENDS
diff --git a/vespalib/src/tests/testkit-mt/CMakeLists.txt b/vespalib/src/tests/testkit-mt/CMakeLists.txt
index ad74618064a..2490fa06cac 100644
--- a/vespalib/src/tests/testkit-mt/CMakeLists.txt
+++ b/vespalib/src/tests/testkit-mt/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(vespalib_testkit-mt_test_app
+vespa_add_executable(vespalib_testkit-mt_test_app TEST
SOURCES
testkit-mt_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/testkit-subset/CMakeLists.txt b/vespalib/src/tests/testkit-subset/CMakeLists.txt
index 8267a213aa7..cde1a0c5cc1 100644
--- a/vespalib/src/tests/testkit-subset/CMakeLists.txt
+++ b/vespalib/src/tests/testkit-subset/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(vespalib_testkit-subset_test_app
+vespa_add_executable(vespalib_testkit-subset_test_app TEST
SOURCES
testkit-subset_test.cpp
testkit-subset_extra.cpp
diff --git a/vespalib/src/tests/testkit-testhook/CMakeLists.txt b/vespalib/src/tests/testkit-testhook/CMakeLists.txt
index 8f5d31ba338..daeee24a9f9 100644
--- a/vespalib/src/tests/testkit-testhook/CMakeLists.txt
+++ b/vespalib/src/tests/testkit-testhook/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(vespalib_testkit-testhook_test_app
+vespa_add_executable(vespalib_testkit-testhook_test_app TEST
SOURCES
testkit-testhook_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/text/lowercase/CMakeLists.txt b/vespalib/src/tests/text/lowercase/CMakeLists.txt
index 82fa2a7f1a7..7466cfe7c3e 100644
--- a/vespalib/src/tests/text/lowercase/CMakeLists.txt
+++ b/vespalib/src/tests/text/lowercase/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(vespalib_lowercase_test_app
+vespa_add_executable(vespalib_lowercase_test_app TEST
SOURCES
lowercase_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/text/stringtokenizer/CMakeLists.txt b/vespalib/src/tests/text/stringtokenizer/CMakeLists.txt
index a31710b2447..571b73dab60 100644
--- a/vespalib/src/tests/text/stringtokenizer/CMakeLists.txt
+++ b/vespalib/src/tests/text/stringtokenizer/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(vespalib_stringtokenizer_test_app
+vespa_add_executable(vespalib_stringtokenizer_test_app TEST
SOURCES
stringtokenizer_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/text/utf8/CMakeLists.txt b/vespalib/src/tests/text/utf8/CMakeLists.txt
index 888df5eb6dc..b9c89f7ada9 100644
--- a/vespalib/src/tests/text/utf8/CMakeLists.txt
+++ b/vespalib/src/tests/text/utf8/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(vespalib_utf8_test_app
+vespa_add_executable(vespalib_utf8_test_app TEST
SOURCES
utf8_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/thread/CMakeLists.txt b/vespalib/src/tests/thread/CMakeLists.txt
index eae0fde2646..2dcb92b2579 100644
--- a/vespalib/src/tests/thread/CMakeLists.txt
+++ b/vespalib/src/tests/thread/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(vespalib_thread_test_app
+vespa_add_executable(vespalib_thread_test_app TEST
SOURCES
thread_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/time_tracker/CMakeLists.txt b/vespalib/src/tests/time_tracker/CMakeLists.txt
index 504cceab892..28563a5d7e3 100644
--- a/vespalib/src/tests/time_tracker/CMakeLists.txt
+++ b/vespalib/src/tests/time_tracker/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(vespalib_time_tracker_test_app
+vespa_add_executable(vespalib_time_tracker_test_app TEST
SOURCES
time_tracker_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/trace/CMakeLists.txt b/vespalib/src/tests/trace/CMakeLists.txt
index c0dbdef7ad3..c87c3f1b3a8 100644
--- a/vespalib/src/tests/trace/CMakeLists.txt
+++ b/vespalib/src/tests/trace/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(vespalib_trace_test_app
+vespa_add_executable(vespalib_trace_test_app TEST
SOURCES
trace.cpp
DEPENDS
diff --git a/vespalib/src/tests/traits/CMakeLists.txt b/vespalib/src/tests/traits/CMakeLists.txt
index 9d9280c671d..866da4ceb40 100644
--- a/vespalib/src/tests/traits/CMakeLists.txt
+++ b/vespalib/src/tests/traits/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(vespalib_traits_test_app
+vespa_add_executable(vespalib_traits_test_app TEST
SOURCES
traits_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/true/CMakeLists.txt b/vespalib/src/tests/true/CMakeLists.txt
index 7042424c1c0..a1aa97460b8 100644
--- a/vespalib/src/tests/true/CMakeLists.txt
+++ b/vespalib/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(vespalib_true_test_app
+vespa_add_executable(vespalib_true_test_app TEST
SOURCES
true.cpp
DEPENDS
diff --git a/vespalib/src/tests/tutorial/CMakeLists.txt b/vespalib/src/tests/tutorial/CMakeLists.txt
index d99ad20ff92..40f12c42edb 100644
--- a/vespalib/src/tests/tutorial/CMakeLists.txt
+++ b/vespalib/src/tests/tutorial/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(vespalib_make_tutorial_app
+vespa_add_executable(vespalib_make_tutorial_app TEST
SOURCES
make_tutorial.cpp
DEPENDS
diff --git a/vespalib/src/tests/tutorial/fixtures/CMakeLists.txt b/vespalib/src/tests/tutorial/fixtures/CMakeLists.txt
index 7e67f34d472..4be33e6fe56 100644
--- a/vespalib/src/tests/tutorial/fixtures/CMakeLists.txt
+++ b/vespalib/src/tests/tutorial/fixtures/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(vespalib_fixtures_test_app
+vespa_add_executable(vespalib_fixtures_test_app TEST
SOURCES
fixtures_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/tutorial/minimal/CMakeLists.txt b/vespalib/src/tests/tutorial/minimal/CMakeLists.txt
index 206684d4d55..dedda165252 100644
--- a/vespalib/src/tests/tutorial/minimal/CMakeLists.txt
+++ b/vespalib/src/tests/tutorial/minimal/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(vespalib_minimal_test_app
+vespa_add_executable(vespalib_minimal_test_app TEST
SOURCES
minimal_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/tutorial/simple/CMakeLists.txt b/vespalib/src/tests/tutorial/simple/CMakeLists.txt
index b23470f4758..31c069a1ee0 100644
--- a/vespalib/src/tests/tutorial/simple/CMakeLists.txt
+++ b/vespalib/src/tests/tutorial/simple/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(vespalib_simple_test_app
+vespa_add_executable(vespalib_simple_test_app TEST
SOURCES
simple_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/tutorial/threads/CMakeLists.txt b/vespalib/src/tests/tutorial/threads/CMakeLists.txt
index 88898df697c..f60939ee9f6 100644
--- a/vespalib/src/tests/tutorial/threads/CMakeLists.txt
+++ b/vespalib/src/tests/tutorial/threads/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(vespalib_threads_test_app
+vespa_add_executable(vespalib_threads_test_app TEST
SOURCES
threads_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/util/generationhandler/CMakeLists.txt b/vespalib/src/tests/util/generationhandler/CMakeLists.txt
index 98c0a59d006..de060996e02 100644
--- a/vespalib/src/tests/util/generationhandler/CMakeLists.txt
+++ b/vespalib/src/tests/util/generationhandler/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(vespalib_generationhandler_test_app
+vespa_add_executable(vespalib_generationhandler_test_app TEST
SOURCES
generationhandler_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/valgrind/CMakeLists.txt b/vespalib/src/tests/valgrind/CMakeLists.txt
index 72643d9b7e7..69bb10cd6d6 100644
--- a/vespalib/src/tests/valgrind/CMakeLists.txt
+++ b/vespalib/src/tests/valgrind/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(vespalib_valgrind_test_app
+vespa_add_executable(vespalib_valgrind_test_app TEST
SOURCES
valgrind_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/weakref/CMakeLists.txt b/vespalib/src/tests/weakref/CMakeLists.txt
index fe2a61d6586..45d6d241224 100644
--- a/vespalib/src/tests/weakref/CMakeLists.txt
+++ b/vespalib/src/tests/weakref/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(vespalib_weakref_test_app
+vespa_add_executable(vespalib_weakref_test_app TEST
SOURCES
weakref_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/websocket/CMakeLists.txt b/vespalib/src/tests/websocket/CMakeLists.txt
index c74aad84692..0617b1f19f6 100644
--- a/vespalib/src/tests/websocket/CMakeLists.txt
+++ b/vespalib/src/tests/websocket/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(vespalib_websocket_test_app
+vespa_add_executable(vespalib_websocket_test_app TEST
SOURCES
websocket_test.cpp
DEPENDS
diff --git a/vespalib/src/tests/zcurve/CMakeLists.txt b/vespalib/src/tests/zcurve/CMakeLists.txt
index 14d08bbe9ba..8bc489a70d6 100644
--- a/vespalib/src/tests/zcurve/CMakeLists.txt
+++ b/vespalib/src/tests/zcurve/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(vespalib_zcurve_test_app
+vespa_add_executable(vespalib_zcurve_test_app TEST
SOURCES
zcurve_test.cpp
DEPENDS
vespalib
)
vespa_add_test(NAME vespalib_zcurve_test_app COMMAND vespalib_zcurve_test_app)
-vespa_add_executable(vespalib_zcurve_ranges_test_app
+vespa_add_executable(vespalib_zcurve_ranges_test_app TEST
SOURCES
zcurve_ranges_test.cpp
DEPENDS
diff --git a/vespalog/src/test/CMakeLists.txt b/vespalog/src/test/CMakeLists.txt
index f9b2f360fa8..b50d9d60cb1 100644
--- a/vespalog/src/test/CMakeLists.txt
+++ b/vespalog/src/test/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(vespalog_bufferedlogtest_app
+vespa_add_executable(vespalog_bufferedlogtest_app TEST
SOURCES
bufferedlogtest.cpp
bufferedlogtest.logger1.cpp
@@ -8,14 +8,14 @@ vespa_add_executable(vespalog_bufferedlogtest_app
vespalog
)
vespa_add_test(NAME vespalog_bufferedlogtest_app NO_VALGRIND COMMAND sh bufferedlogtest_test.sh)
-vespa_add_executable(vespalog_bufferedlogskiptest_app
+vespa_add_executable(vespalog_bufferedlogskiptest_app TEST
SOURCES
bufferedlogskiptest.cpp
DEPENDS
vespalog
)
vespa_add_test(NAME vespalog_bufferedlogskiptest_app NO_VALGRIND COMMAND sh bufferedlogskiptest_test.sh)
-vespa_add_executable(vespalog_rejectfiltertest_app
+vespa_add_executable(vespalog_rejectfiltertest_app TEST
SOURCES
rejectfiltertest.cpp
DEPENDS
diff --git a/vespalog/src/test/simple/CMakeLists.txt b/vespalog/src/test/simple/CMakeLists.txt
index f915772d80f..6d3821b07d8 100644
--- a/vespalog/src/test/simple/CMakeLists.txt
+++ b/vespalog/src/test/simple/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(vespalog_simple_test_app
+vespa_add_executable(vespalog_simple_test_app TEST
SOURCES
logtest.cpp
DEPENDS
diff --git a/vespalog/src/test/threads/CMakeLists.txt b/vespalog/src/test/threads/CMakeLists.txt
index 77928ed3213..f49f00115c6 100644
--- a/vespalog/src/test/threads/CMakeLists.txt
+++ b/vespalog/src/test/threads/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(vespalog_threads_test_app
+vespa_add_executable(vespalog_threads_test_app TEST
SOURCES
testthreads.cpp
DEPENDS
diff --git a/vespamalloc/src/tests/doubledelete/CMakeLists.txt b/vespamalloc/src/tests/doubledelete/CMakeLists.txt
index e38f163148a..c687b7ab098 100644
--- a/vespamalloc/src/tests/doubledelete/CMakeLists.txt
+++ b/vespamalloc/src/tests/doubledelete/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(vespamalloc_doubledelete_test_app
+vespa_add_executable(vespamalloc_doubledelete_test_app TEST
SOURCES
doubledelete.cpp
DEPENDS
diff --git a/vespamalloc/src/tests/overwrite/CMakeLists.txt b/vespamalloc/src/tests/overwrite/CMakeLists.txt
index f3625bd396c..7777c930669 100644
--- a/vespamalloc/src/tests/overwrite/CMakeLists.txt
+++ b/vespamalloc/src/tests/overwrite/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(vespamalloc_overwrite_test_app
+vespa_add_executable(vespamalloc_overwrite_test_app TEST
SOURCES
overwrite.cpp
DEPENDS
diff --git a/vespamalloc/src/tests/stacktrace/CMakeLists.txt b/vespamalloc/src/tests/stacktrace/CMakeLists.txt
index 6d8fbfcbaa1..6aed633e918 100644
--- a/vespamalloc/src/tests/stacktrace/CMakeLists.txt
+++ b/vespamalloc/src/tests/stacktrace/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(vespamalloc_stacktrace_test_app
+vespa_add_executable(vespamalloc_stacktrace_test_app TEST
SOURCES
stacktrace.cpp
backtrace.c
diff --git a/vespamalloc/src/tests/test1/CMakeLists.txt b/vespamalloc/src/tests/test1/CMakeLists.txt
index dc0217b139a..205de0f96fc 100644
--- a/vespamalloc/src/tests/test1/CMakeLists.txt
+++ b/vespamalloc/src/tests/test1/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(vespamalloc_testatomic_app
+vespa_add_executable(vespamalloc_testatomic_app TEST
SOURCES
testatomic.cpp
DEPENDS
diff --git a/vespamalloc/src/tests/test2/CMakeLists.txt b/vespamalloc/src/tests/test2/CMakeLists.txt
index 668c09feb03..c2bd7fc1a70 100644
--- a/vespamalloc/src/tests/test2/CMakeLists.txt
+++ b/vespamalloc/src/tests/test2/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(vespamalloc_testgraph_app
+vespa_add_executable(vespamalloc_testgraph_app TEST
SOURCES
testgraph.cpp
../../vespamalloc/util/stream.cpp
diff --git a/vespamalloc/src/tests/thread/CMakeLists.txt b/vespamalloc/src/tests/thread/CMakeLists.txt
index 67539a68f77..e9bf1489347 100644
--- a/vespamalloc/src/tests/thread/CMakeLists.txt
+++ b/vespamalloc/src/tests/thread/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(vespamalloc_thread_test_app
+vespa_add_executable(vespamalloc_thread_test_app TEST
SOURCES
thread.cpp
)
diff --git a/vsm/src/tests/charbuffer/CMakeLists.txt b/vsm/src/tests/charbuffer/CMakeLists.txt
index 38d1f519714..44e6c4072b8 100644
--- a/vsm/src/tests/charbuffer/CMakeLists.txt
+++ b/vsm/src/tests/charbuffer/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(vsm_charbuffer_test_app
+vespa_add_executable(vsm_charbuffer_test_app TEST
SOURCES
charbuffer.cpp
DEPENDS
diff --git a/vsm/src/tests/docsum/CMakeLists.txt b/vsm/src/tests/docsum/CMakeLists.txt
index 506e0a9bf66..1b9203ea5cf 100644
--- a/vsm/src/tests/docsum/CMakeLists.txt
+++ b/vsm/src/tests/docsum/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(vsm_docsum_test_app
+vespa_add_executable(vsm_docsum_test_app TEST
SOURCES
docsum.cpp
DEPENDS
diff --git a/vsm/src/tests/document/CMakeLists.txt b/vsm/src/tests/document/CMakeLists.txt
index 36da98129a1..6b7a1688a56 100644
--- a/vsm/src/tests/document/CMakeLists.txt
+++ b/vsm/src/tests/document/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(vsm_document_test_app
+vespa_add_executable(vsm_document_test_app TEST
SOURCES
document.cpp
DEPENDS
diff --git a/vsm/src/tests/searcher/CMakeLists.txt b/vsm/src/tests/searcher/CMakeLists.txt
index 26d6115e3a7..a91f2f60b9d 100644
--- a/vsm/src/tests/searcher/CMakeLists.txt
+++ b/vsm/src/tests/searcher/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(vsm_searcher_test_app
+vespa_add_executable(vsm_searcher_test_app TEST
SOURCES
searcher.cpp
DEPENDS
diff --git a/vsm/src/tests/textutil/CMakeLists.txt b/vsm/src/tests/textutil/CMakeLists.txt
index c3169a842f0..7915e595477 100644
--- a/vsm/src/tests/textutil/CMakeLists.txt
+++ b/vsm/src/tests/textutil/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(vsm_textutil_test_app
+vespa_add_executable(vsm_textutil_test_app TEST
SOURCES
textutil.cpp
DEPENDS