Merge branch 'master' into aressem/vespa-compile-on-centos7

17 files changed, 23 insertions, 23 deletions

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