summaryrefslogtreecommitdiffstats
path: root/storage/src/tests/common
diff options
context:
space:
mode:
authorGeir Storli <geirst@verizonmedia.com>2019-06-04 08:51:39 +0000
committerGeir Storli <geirst@verizonmedia.com>2019-06-04 08:53:31 +0000
commit39604a2c8120e488a80c814a9530f800be1b805f (patch)
treec6b8aa74f8e2e59a4be22f0c42736f78dc4d9d3c /storage/src/tests/common
parent05a2b4d3fbf3be03c69a42252051c141ec11fc14 (diff)
Create gtest runner per test sub-module.
This makes it possible to run storage tests in parallel.
Diffstat (limited to 'storage/src/tests/common')
-rw-r--r--storage/src/tests/common/.gitignore1
-rw-r--r--storage/src/tests/common/CMakeLists.txt13
-rw-r--r--storage/src/tests/common/gtest_runner.cpp8
-rw-r--r--storage/src/tests/common/hostreporter/.gitignore1
-rw-r--r--storage/src/tests/common/hostreporter/CMakeLists.txt13
-rw-r--r--storage/src/tests/common/hostreporter/gtest_runner.cpp8
6 files changed, 44 insertions, 0 deletions
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()