Create gtest runner per test sub-module.

This makes it possible to run storage tests in parallel.

31 files changed, 226 insertions, 17 deletions

diff --git a/storage/src/tests/CMakeLists.txt b/storage/src/tests/CMakeLists.txt
index 1894a3fe6a8..68ed987599a 100644
--- a/storage/src/tests/CMakeLists.txt
+++ b/storage/src/tests/CMakeLists.txt
@@ -1,21 +1,7 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-# Runner for unit tests written in gtest.
-# NOTE: All new test classes should be added here.
-vespa_add_executable(storage_gtest_runner_app TEST
-    SOURCES
-    gtest_runner.cpp
-    DEPENDS
-    storage_testbucketmover
-    storage_gtestdistributor
-)
-
-vespa_add_test(
-    NAME storage_gtest_runner_app
-    COMMAND storage_gtest_runner_app
-)
-
 # Runner for unit tests written in CppUnit (DEPRECATED).
+# NOTE: All new tests should be written in gtest. Each test sub-module has a gtest runner.
 vespa_add_executable(storage_testrunner_app TEST
     SOURCES
     testrunner.cpp
diff --git a/storage/src/tests/bucketdb/.gitignore b/storage/src/tests/bucketdb/.gitignore
index 4e71c44a596..89fd7376b0d 100644
--- a/storage/src/tests/bucketdb/.gitignore
+++ b/storage/src/tests/bucketdb/.gitignore
@@ -10,3 +10,4 @@
 .libs
 Makefile
 testrunner
+storage_bucketdb_gtest_runner_app
diff --git a/storage/src/tests/bucketdb/CMakeLists.txt b/storage/src/tests/bucketdb/CMakeLists.txt
index 13c9863aa8e..714faf34de5 100644
--- a/storage/src/tests/bucketdb/CMakeLists.txt
+++ b/storage/src/tests/bucketdb/CMakeLists.txt
@@ -1,4 +1,6 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+# TODO: Remove test library when all tests have been migrated to gtest.
 vespa_add_library(storage_testbucketdb TEST
     SOURCES
     bucketinfotest.cpp
@@ -11,3 +13,17 @@ vespa_add_library(storage_testbucketdb TEST
     storage
     storage_testcommon
 )
+
+vespa_add_executable(storage_bucketdb_gtest_runner_app TEST
+    SOURCES
+    gtest_runner.cpp
+    DEPENDS
+    storage
+    storage_testcommon
+    gtest
+)
+
+vespa_add_test(
+    NAME storage_bucketdb_gtest_runner_app
+    COMMAND storage_bucketdb_gtest_runner_app
+)
diff --git a/storage/src/tests/bucketdb/gtest_runner.cpp b/storage/src/tests/bucketdb/gtest_runner.cpp
new file mode 100644
index 00000000000..040a47b8fd3
--- /dev/null
+++ b/storage/src/tests/bucketdb/gtest_runner.cpp
@@ -0,0 +1,8 @@
+// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include <vespa/vespalib/gtest/gtest.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP("storage_bucketdb_gtest_runner");
+
+GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/storage/src/tests/bucketmover/.gitignore b/storage/src/tests/bucketmover/.gitignore
new file mode 100644
index 00000000000..2f86228e663
--- /dev/null
+++ b/storage/src/tests/bucketmover/.gitignore
@@ -0,0 +1 @@
+storage_bucketmover_gtest_runner_app
diff --git a/storage/src/tests/bucketmover/CMakeLists.txt b/storage/src/tests/bucketmover/CMakeLists.txt
index d4304477817..c7a6e8fc21e 100644
--- a/storage/src/tests/bucketmover/CMakeLists.txt
+++ b/storage/src/tests/bucketmover/CMakeLists.txt
@@ -1,10 +1,16 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(storage_testbucketmover TEST
+vespa_add_executable(storage_bucketmover_gtest_runner_app TEST
     SOURCES
     bucketmovertest.cpp
     htmltabletest.cpp
+    gtest_runner.cpp
     DEPENDS
     storage
     storage_testcommon
     gtest
 )
+
+vespa_add_test(
+    NAME storage_bucketmover_gtest_runner_app
+    COMMAND storage_bucketmover_gtest_runner_app
+)
diff --git a/storage/src/tests/bucketmover/gtest_runner.cpp b/storage/src/tests/bucketmover/gtest_runner.cpp
new file mode 100644
index 00000000000..3d49ada55a7
--- /dev/null
+++ b/storage/src/tests/bucketmover/gtest_runner.cpp
@@ -0,0 +1,8 @@
+// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include <vespa/vespalib/gtest/gtest.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP("storage_bucketmover_gtest_runner");
+
+GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/storage/src/tests/common/.gitignore b/storage/src/tests/common/.gitignore
index 333f254ba10..19029715cad 100644
--- a/storage/src/tests/common/.gitignore
+++ b/storage/src/tests/common/.gitignore
@@ -6,3 +6,4 @@
 .deps
 .libs
 Makefile
+storage_common_gtest_runner_app
diff --git a/storage/src/tests/common/CMakeLists.txt b/storage/src/tests/common/CMakeLists.txt
index 991726c935b..ce5376209dc 100644
--- a/storage/src/tests/common/CMakeLists.txt
+++ b/storage/src/tests/common/CMakeLists.txt
@@ -11,3 +11,16 @@ vespa_add_library(storage_testcommon TEST
     DEPENDS
     storage
 )
+
+vespa_add_executable(storage_common_gtest_runner_app TEST
+    SOURCES
+    gtest_runner.cpp
+    DEPENDS
+    storage
+    gtest
+)
+
+vespa_add_test(
+    NAME storage_common_gtest_runner_app
+    COMMAND storage_common_gtest_runner_app
+)
diff --git a/storage/src/tests/common/gtest_runner.cpp b/storage/src/tests/common/gtest_runner.cpp
new file mode 100644
index 00000000000..fbe284d9b22
--- /dev/null
+++ b/storage/src/tests/common/gtest_runner.cpp
@@ -0,0 +1,8 @@
+// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include <vespa/vespalib/gtest/gtest.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP("storage_common_gtest_runner");
+
+GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/storage/src/tests/common/hostreporter/.gitignore b/storage/src/tests/common/hostreporter/.gitignore
new file mode 100644
index 00000000000..3ea8be2b247
--- /dev/null
+++ b/storage/src/tests/common/hostreporter/.gitignore
@@ -0,0 +1 @@
+storage_hostreporter_gtest_runner_app
diff --git a/storage/src/tests/common/hostreporter/CMakeLists.txt b/storage/src/tests/common/hostreporter/CMakeLists.txt
index bfc49299186..7a4a23ba7aa 100644
--- a/storage/src/tests/common/hostreporter/CMakeLists.txt
+++ b/storage/src/tests/common/hostreporter/CMakeLists.txt
@@ -7,3 +7,16 @@ vespa_add_library(storage_testhostreporter TEST
     DEPENDS
     storage
 )
+
+vespa_add_executable(storage_hostreporter_gtest_runner_app TEST
+    SOURCES
+    gtest_runner.cpp
+    DEPENDS
+    storage
+    gtest
+)
+
+vespa_add_test(
+    NAME storage_hostreporter_gtest_runner_app
+    COMMAND storage_hostreporter_gtest_runner_app
+)
diff --git a/storage/src/tests/common/hostreporter/gtest_runner.cpp b/storage/src/tests/common/hostreporter/gtest_runner.cpp
new file mode 100644
index 00000000000..e12171c51e1
--- /dev/null
+++ b/storage/src/tests/common/hostreporter/gtest_runner.cpp
@@ -0,0 +1,8 @@
+// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include <vespa/vespalib/gtest/gtest.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP("storage_hostreporter_gtest_runner");
+
+GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/storage/src/tests/distributor/.gitignore b/storage/src/tests/distributor/.gitignore
index 333f254ba10..03fb3b3e7bb 100644
--- a/storage/src/tests/distributor/.gitignore
+++ b/storage/src/tests/distributor/.gitignore
@@ -6,3 +6,4 @@
 .deps
 .libs
 Makefile
+storage_distributor_gtest_runner_app
diff --git a/storage/src/tests/distributor/CMakeLists.txt b/storage/src/tests/distributor/CMakeLists.txt
index 245d54e8e69..c5d23badfd6 100644
--- a/storage/src/tests/distributor/CMakeLists.txt
+++ b/storage/src/tests/distributor/CMakeLists.txt
@@ -43,20 +43,27 @@ vespa_add_library(storage_testdistributor TEST
     storage_testhostreporter
 )
 
-vespa_add_library(storage_gtestdistributor TEST
+vespa_add_executable(storage_distributor_gtest_runner_app TEST
     SOURCES
     btree_bucket_database_test.cpp
     bucketdatabasetest.cpp
     bucketdbupdatertest.cpp
     mapbucketdatabasetest.cpp
     putoperationtest.cpp
+    # TODO: Depend on storage_testdistributor when all tests have been migrated
     # Fixture etc. dupes with non-gtest runner :
     distributortestutil.cpp
     bucket_db_prune_elision_test.cpp
     messagesenderstub.cpp
+    gtest_runner.cpp
     DEPENDS
     storage_distributor
     storage_testcommon
     storage_testhostreporter
     gtest
 )
+
+vespa_add_test(
+    NAME storage_distributor_gtest_runner_app
+    COMMAND storage_distributor_gtest_runner_app
+)
diff --git a/storage/src/tests/distributor/gtest_runner.cpp b/storage/src/tests/distributor/gtest_runner.cpp
new file mode 100644
index 00000000000..0812f63f901
--- /dev/null
+++ b/storage/src/tests/distributor/gtest_runner.cpp
@@ -0,0 +1,8 @@
+// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include <vespa/vespalib/gtest/gtest.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP("storage_distributor_gtest_runner");
+
+GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/storage/src/tests/frameworkimpl/status/.gitignore b/storage/src/tests/frameworkimpl/status/.gitignore
new file mode 100644
index 00000000000..a971f7b6644
--- /dev/null
+++ b/storage/src/tests/frameworkimpl/status/.gitignore
@@ -0,0 +1 @@
+storage_status_gtest_runner_app
diff --git a/storage/src/tests/frameworkimpl/status/CMakeLists.txt b/storage/src/tests/frameworkimpl/status/CMakeLists.txt
index 46653e6a017..fb550807dff 100644
--- a/storage/src/tests/frameworkimpl/status/CMakeLists.txt
+++ b/storage/src/tests/frameworkimpl/status/CMakeLists.txt
@@ -1,4 +1,6 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+# TODO: Remove test library when test has been migrated to gtest.
 vespa_add_library(storage_teststatus TEST
     SOURCES
     statustest.cpp
@@ -6,3 +8,17 @@ vespa_add_library(storage_teststatus TEST
     storage
     storage_testcommon
 )
+
+vespa_add_executable(storage_status_gtest_runner_app TEST
+    SOURCES
+    gtest_runner.cpp
+    DEPENDS
+    storage
+    storage_testcommon
+    gtest
+)
+
+vespa_add_test(
+    NAME storage_status_gtest_runner_app
+    COMMAND storage_status_gtest_runner_app
+)
diff --git a/storage/src/tests/frameworkimpl/status/gtest_runner.cpp b/storage/src/tests/frameworkimpl/status/gtest_runner.cpp
new file mode 100644
index 00000000000..41c2e676fe4
--- /dev/null
+++ b/storage/src/tests/frameworkimpl/status/gtest_runner.cpp
@@ -0,0 +1,8 @@
+// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include <vespa/vespalib/gtest/gtest.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP("storage_status_gtest_runner");
+
+GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/storage/src/tests/persistence/.gitignore b/storage/src/tests/persistence/.gitignore
index 184e5d1c936..fb54315fde1 100644
--- a/storage/src/tests/persistence/.gitignore
+++ b/storage/src/tests/persistence/.gitignore
@@ -10,3 +10,4 @@
 Makefile
 testrunner
 testrunner.core
+storage_persistence_gtest_runner_app
diff --git a/storage/src/tests/persistence/CMakeLists.txt b/storage/src/tests/persistence/CMakeLists.txt
index fb0337f0953..0e4c661c749 100644
--- a/storage/src/tests/persistence/CMakeLists.txt
+++ b/storage/src/tests/persistence/CMakeLists.txt
@@ -16,3 +16,18 @@ vespa_add_library(storage_testpersistence TEST
     storage_testdistributor
     storage_testpersistence_common
 )
+
+vespa_add_executable(storage_persistence_gtest_runner_app TEST
+    SOURCES
+    gtest_runner.cpp
+    DEPENDS
+    storage
+    storage_testdistributor
+    storage_testpersistence_common
+    gtest
+)
+
+vespa_add_test(
+    NAME storage_persistence_gtest_runner_app
+    COMMAND storage_persistence_gtest_runner_app
+)
diff --git a/storage/src/tests/persistence/filestorage/.gitignore b/storage/src/tests/persistence/filestorage/.gitignore
index cfeb99e9e3f..abf7273b635 100644
--- a/storage/src/tests/persistence/filestorage/.gitignore
+++ b/storage/src/tests/persistence/filestorage/.gitignore
@@ -11,3 +11,4 @@ Makefile
 persistence
 testrunner
 testrunner.core
+storage_filestorage_gtest_runner_app
diff --git a/storage/src/tests/persistence/filestorage/CMakeLists.txt b/storage/src/tests/persistence/filestorage/CMakeLists.txt
index dfd5902b236..3827b6ac319 100644
--- a/storage/src/tests/persistence/filestorage/CMakeLists.txt
+++ b/storage/src/tests/persistence/filestorage/CMakeLists.txt
@@ -1,4 +1,6 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+# TODO: Remove test library when all tests have been migrated to gtest.
 vespa_add_library(storage_testfilestorage TEST
     SOURCES
     deactivatebucketstest.cpp
@@ -15,3 +17,18 @@ vespa_add_library(storage_testfilestorage TEST
     storageapi
     storage_testpersistence_common
 )
+
+vespa_add_executable(storage_filestorage_gtest_runner_app TEST
+    SOURCES
+    gtest_runner.cpp
+    DEPENDS
+    storage
+    storageapi
+    storage_testpersistence_common
+    gtest
+)
+
+vespa_add_test(
+    NAME storage_filestorage_gtest_runner_app
+    COMMAND storage_filestorage_gtest_runner_app
+)
diff --git a/storage/src/tests/persistence/filestorage/gtest_runner.cpp b/storage/src/tests/persistence/filestorage/gtest_runner.cpp
new file mode 100644
index 00000000000..f95ed8da092
--- /dev/null
+++ b/storage/src/tests/persistence/filestorage/gtest_runner.cpp
@@ -0,0 +1,8 @@
+// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include <vespa/vespalib/gtest/gtest.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP("storage_filestorage_gtest_runner");
+
+GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/storage/src/tests/persistence/gtest_runner.cpp b/storage/src/tests/persistence/gtest_runner.cpp
new file mode 100644
index 00000000000..d9049105e6e
--- /dev/null
+++ b/storage/src/tests/persistence/gtest_runner.cpp
@@ -0,0 +1,8 @@
+// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include <vespa/vespalib/gtest/gtest.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP("storage_persistence_gtest_runner");
+
+GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/storage/src/tests/storageserver/.gitignore b/storage/src/tests/storageserver/.gitignore
index c4098089f09..dd9d668558a 100644
--- a/storage/src/tests/storageserver/.gitignore
+++ b/storage/src/tests/storageserver/.gitignore
@@ -11,3 +11,4 @@ Makefile
 filestorage
 testrunner
 testrunner.core
+storage_storageserver_gtest_runner_app
diff --git a/storage/src/tests/storageserver/CMakeLists.txt b/storage/src/tests/storageserver/CMakeLists.txt
index c28a6102b71..aa1059e6d79 100644
--- a/storage/src/tests/storageserver/CMakeLists.txt
+++ b/storage/src/tests/storageserver/CMakeLists.txt
@@ -18,3 +18,17 @@ vespa_add_library(storage_teststorageserver TEST
     storage_storageserver
     storage_testcommon
 )
+
+vespa_add_executable(storage_storageserver_gtest_runner_app TEST
+    SOURCES
+    gtest_runner.cpp
+    DEPENDS
+    storage_storageserver
+    storage_testcommon
+    gtest
+)
+
+vespa_add_test(
+    NAME storage_storageserver_gtest_runner_app
+    COMMAND storage_storageserver_gtest_runner_app
+)
diff --git a/storage/src/tests/storageserver/gtest_runner.cpp b/storage/src/tests/storageserver/gtest_runner.cpp
new file mode 100644
index 00000000000..a2a3a62a226
--- /dev/null
+++ b/storage/src/tests/storageserver/gtest_runner.cpp
@@ -0,0 +1,8 @@
+// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include <vespa/vespalib/gtest/gtest.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP("storage_storageserver_gtest_runner");
+
+GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/storage/src/tests/visiting/.gitignore b/storage/src/tests/visiting/.gitignore
index 184e5d1c936..2123d0d1796 100644
--- a/storage/src/tests/visiting/.gitignore
+++ b/storage/src/tests/visiting/.gitignore
@@ -10,3 +10,4 @@
 Makefile
 testrunner
 testrunner.core
+storage_visiting_gtest_runner_app
diff --git a/storage/src/tests/visiting/CMakeLists.txt b/storage/src/tests/visiting/CMakeLists.txt
index 1c048e70468..438086fddd3 100644
--- a/storage/src/tests/visiting/CMakeLists.txt
+++ b/storage/src/tests/visiting/CMakeLists.txt
@@ -1,4 +1,6 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+# TODO: Remove test library when all tests have been migrated to gtest.
 vespa_add_library(storage_testvisiting TEST
     SOURCES
     commandqueuetest.cpp
@@ -9,3 +11,17 @@ vespa_add_library(storage_testvisiting TEST
     storage
     storage_teststorageserver
 )
+
+vespa_add_executable(storage_visiting_gtest_runner_app TEST
+    SOURCES
+    gtest_runner.cpp
+    DEPENDS
+    storage
+    storage_teststorageserver
+    gtest
+)
+
+vespa_add_test(
+    NAME storage_visiting_gtest_runner_app
+    COMMAND storage_visiting_gtest_runner_app
+)
diff --git a/storage/src/tests/visiting/gtest_runner.cpp b/storage/src/tests/visiting/gtest_runner.cpp
new file mode 100644
index 00000000000..7700bcfdc9e
--- /dev/null
+++ b/storage/src/tests/visiting/gtest_runner.cpp
@@ -0,0 +1,8 @@
+// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include <vespa/vespalib/gtest/gtest.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP("storage_visiting_gtest_runner");
+
+GTEST_MAIN_RUN_ALL_TESTS()