Merge pull request #65 from yahoo/vegard/test-libs-as-test-targets

Vegard/test libs as test targets

12 files changed, 12 insertions, 24 deletions

diff --git a/storage/src/tests/bucketdb/CMakeLists.txt b/storage/src/tests/bucketdb/CMakeLists.txt
index 95228966589..c24db3fed6d 100644
--- a/storage/src/tests/bucketdb/CMakeLists.txt
+++ b/storage/src/tests/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_library(storage_testbucketdb
+vespa_add_library(storage_testbucketdb TEST
     SOURCES
     initializertest.cpp
     bucketmanagertest.cpp
@@ -8,7 +8,6 @@ vespa_add_library(storage_testbucketdb
     lockablemaptest.cpp
     bucketinfotest.cpp
     distribution_hash_normalizer_test.cpp
-    DEPENDS
     AFTER
     storage_storageconfig
 )
diff --git a/storage/src/tests/bucketmover/CMakeLists.txt b/storage/src/tests/bucketmover/CMakeLists.txt
index 2d02cdc4942..e2929187f62 100644
--- a/storage/src/tests/bucketmover/CMakeLists.txt
+++ b/storage/src/tests/bucketmover/CMakeLists.txt
@@ -1,9 +1,8 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(storage_testbucketmover
+vespa_add_library(storage_testbucketmover TEST
     SOURCES
     bucketmovertest.cpp
     htmltabletest.cpp
-    DEPENDS
     AFTER
     storage_storageconfig
 )
diff --git a/storage/src/tests/common/CMakeLists.txt b/storage/src/tests/common/CMakeLists.txt
index 309308473e1..dd1cdf87dcd 100644
--- a/storage/src/tests/common/CMakeLists.txt
+++ b/storage/src/tests/common/CMakeLists.txt
@@ -1,12 +1,11 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(storage_testcommon
+vespa_add_library(storage_testcommon TEST
     SOURCES
     dummystoragelink.cpp
     testhelper.cpp
     metricstest.cpp
     storagelinktest.cpp
     teststorageapp.cpp
-    DEPENDS
     AFTER
     storage_storageconfig
 )
diff --git a/storage/src/tests/common/hostreporter/CMakeLists.txt b/storage/src/tests/common/hostreporter/CMakeLists.txt
index f0cb197c5e2..9e3fabdcb29 100644
--- a/storage/src/tests/common/hostreporter/CMakeLists.txt
+++ b/storage/src/tests/common/hostreporter/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(storage_testhostreporter
+vespa_add_library(storage_testhostreporter TEST
     SOURCES
     cpureportertest.cpp
     memreportertest.cpp
@@ -8,7 +8,6 @@ vespa_add_library(storage_testhostreporter
     diskreportertest.cpp
     util.cpp
     hostinfotest.cpp
-    DEPENDS
     AFTER
     storage_storageconfig
 )
diff --git a/storage/src/tests/distributor/CMakeLists.txt b/storage/src/tests/distributor/CMakeLists.txt
index 6c6ba62ba6e..29bb8cb67c1 100644
--- a/storage/src/tests/distributor/CMakeLists.txt
+++ b/storage/src/tests/distributor/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(storage_testdistributor
+vespa_add_library(storage_testdistributor TEST
     SOURCES
     mergelimitertest.cpp
     bucketdatabasetest.cpp
@@ -38,7 +38,6 @@ vespa_add_library(storage_testdistributor
     bucketgctimecalculatortest.cpp
     nodemaintenancestatstrackertest.cpp
     distributor_host_info_reporter_test.cpp
-    DEPENDS
     AFTER
     storage_storageconfig
 )
diff --git a/storage/src/tests/frameworkimpl/memory/CMakeLists.txt b/storage/src/tests/frameworkimpl/memory/CMakeLists.txt
index da78716459f..4d89a4aa548 100644
--- a/storage/src/tests/frameworkimpl/memory/CMakeLists.txt
+++ b/storage/src/tests/frameworkimpl/memory/CMakeLists.txt
@@ -1,8 +1,7 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(storage_testmemory
+vespa_add_library(storage_testmemory TEST
     SOURCES
     memorystatusviewertest.cpp
-    DEPENDS
     AFTER
     storage_storageconfig
 )
diff --git a/storage/src/tests/frameworkimpl/status/CMakeLists.txt b/storage/src/tests/frameworkimpl/status/CMakeLists.txt
index 734be8e9998..95c4d3a532e 100644
--- a/storage/src/tests/frameworkimpl/status/CMakeLists.txt
+++ b/storage/src/tests/frameworkimpl/status/CMakeLists.txt
@@ -1,8 +1,7 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(storage_teststatus
+vespa_add_library(storage_teststatus TEST
     SOURCES
     statustest.cpp
-    DEPENDS
     AFTER
     storage_storageconfig
 )
diff --git a/storage/src/tests/persistence/CMakeLists.txt b/storage/src/tests/persistence/CMakeLists.txt
index c065c3eef5b..db0ac64c183 100644
--- a/storage/src/tests/persistence/CMakeLists.txt
+++ b/storage/src/tests/persistence/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(storage_testpersistence
+vespa_add_library(storage_testpersistence TEST
     SOURCES
     processalltest.cpp
     persistencetestutils.cpp
@@ -13,7 +13,6 @@ vespa_add_library(storage_testpersistence
     bucketownershipnotifiertest.cpp
     persistencequeuetest.cpp
     testandsettest.cpp
-    DEPENDS
     AFTER
     storage_storageconfig
 )
diff --git a/storage/src/tests/persistence/filestorage/CMakeLists.txt b/storage/src/tests/persistence/filestorage/CMakeLists.txt
index b1314ca0537..072feb4a940 100644
--- a/storage/src/tests/persistence/filestorage/CMakeLists.txt
+++ b/storage/src/tests/persistence/filestorage/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(storage_testfilestorage
+vespa_add_library(storage_testfilestorage TEST
     SOURCES
     filestormanagertest.cpp
     operationabortingtest.cpp
@@ -11,7 +11,6 @@ vespa_add_library(storage_testfilestorage
     filestormodifiedbucketstest.cpp
     deletebuckettest.cpp
     singlebucketjointest.cpp
-    DEPENDS
     AFTER
     storage_storageconfig
 )
diff --git a/storage/src/tests/storageserver/CMakeLists.txt b/storage/src/tests/storageserver/CMakeLists.txt
index 2e327089b4c..88e518f1ad1 100644
--- a/storage/src/tests/storageserver/CMakeLists.txt
+++ b/storage/src/tests/storageserver/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(storage_teststorageserver
+vespa_add_library(storage_teststorageserver TEST
     SOURCES
     communicationmanagertest.cpp
     statemanagertest.cpp
@@ -11,7 +11,6 @@ vespa_add_library(storage_teststorageserver
     priorityconvertertest.cpp
     statereportertest.cpp
     changedbucketownershiphandlertest.cpp
-    DEPENDS
     AFTER
     storage_storageconfig
 )
diff --git a/storage/src/tests/storageutil/CMakeLists.txt b/storage/src/tests/storageutil/CMakeLists.txt
index a48895352e8..e49361285d8 100644
--- a/storage/src/tests/storageutil/CMakeLists.txt
+++ b/storage/src/tests/storageutil/CMakeLists.txt
@@ -1,10 +1,9 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(storage_teststorageutil
+vespa_add_library(storage_teststorageutil TEST
     SOURCES
     functortest.cpp
     charttest.cpp
     palettetest.cpp
-    DEPENDS
     AFTER
     storage_storageconfig
 )
diff --git a/storage/src/tests/visiting/CMakeLists.txt b/storage/src/tests/visiting/CMakeLists.txt
index fde0eb6ac3d..f1c10bde4f0 100644
--- a/storage/src/tests/visiting/CMakeLists.txt
+++ b/storage/src/tests/visiting/CMakeLists.txt
@@ -1,11 +1,10 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(storage_testvisiting
+vespa_add_library(storage_testvisiting TEST
     SOURCES
     commandqueuetest.cpp
     visitormanagertest.cpp
     visitortest.cpp
     memory_bounded_trace_test.cpp
-    DEPENDS
     AFTER
     storage_storageconfig
     storage_visitor