diff options
| author | Geir Storli <geirst@verizonmedia.com> | 2020-09-09 13:10:45 +0000 |
|---|---|---|
| committer | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2020-09-14 13:22:14 +0000 |
| commit | 42459a49b016d89c1b538284b7acd9b45415955b (patch) | |
| tree | 5165d69ab7a6dde095f6f69e5d586008875c9a7b /storage | |
| parent | 54150406f3c490463bc5371c9480452da168bd5c (diff) | |
Move storageserver rpc unit tests to separate subfolder with its own gtest runner.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | storage/src/tests/storageserver/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | storage/src/tests/storageserver/rpc/.gitignore | 1 | ||||
| -rw-r--r-- | storage/src/tests/storageserver/rpc/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | storage/src/tests/storageserver/rpc/cluster_controller_rpc_api_service_test.cpp (renamed from storage/src/tests/storageserver/cluster_controller_rpc_api_service_test.cpp) | 0 | ||||
| -rw-r--r-- | storage/src/tests/storageserver/rpc/gtest_runner.cpp | 8 |
6 files changed, 26 insertions, 1 deletions
diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt index cbfd4f1606d..426f57db21b 100644 --- a/storage/CMakeLists.txt +++ b/storage/CMakeLists.txt @@ -61,5 +61,6 @@ vespa_define_module( src/tests/persistence/common src/tests/persistence/filestorage src/tests/storageserver + src/tests/storageserver/rpc src/tests/visiting ) diff --git a/storage/src/tests/storageserver/CMakeLists.txt b/storage/src/tests/storageserver/CMakeLists.txt index 680779f27cb..b3c2257c3d9 100644 --- a/storage/src/tests/storageserver/CMakeLists.txt +++ b/storage/src/tests/storageserver/CMakeLists.txt @@ -14,7 +14,6 @@ vespa_add_executable(storage_storageserver_gtest_runner_app TEST communicationmanagertest.cpp configurable_bucket_resolver_test.cpp documentapiconvertertest.cpp - cluster_controller_rpc_api_service_test.cpp mergethrottlertest.cpp priorityconvertertest.cpp service_layer_error_listener_test.cpp diff --git a/storage/src/tests/storageserver/rpc/.gitignore b/storage/src/tests/storageserver/rpc/.gitignore new file mode 100644 index 00000000000..a04ce7d5907 --- /dev/null +++ b/storage/src/tests/storageserver/rpc/.gitignore @@ -0,0 +1 @@ +storage_storageserver_rpc_gtest_runner_app diff --git a/storage/src/tests/storageserver/rpc/CMakeLists.txt b/storage/src/tests/storageserver/rpc/CMakeLists.txt new file mode 100644 index 00000000000..ae7128b7484 --- /dev/null +++ b/storage/src/tests/storageserver/rpc/CMakeLists.txt @@ -0,0 +1,16 @@ +# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(storage_storageserver_rpc_gtest_runner_app TEST + SOURCES + cluster_controller_rpc_api_service_test.cpp + gtest_runner.cpp + DEPENDS + storage_storageserver + storage_testcommon + storage_teststorageserver + GTest::GTest +) + +vespa_add_test( + NAME storage_storageserver_rpc_gtest_runner_app + COMMAND storage_storageserver_rpc_gtest_runner_app +) diff --git a/storage/src/tests/storageserver/cluster_controller_rpc_api_service_test.cpp b/storage/src/tests/storageserver/rpc/cluster_controller_rpc_api_service_test.cpp index 7510e0579ea..7510e0579ea 100644 --- a/storage/src/tests/storageserver/cluster_controller_rpc_api_service_test.cpp +++ b/storage/src/tests/storageserver/rpc/cluster_controller_rpc_api_service_test.cpp diff --git a/storage/src/tests/storageserver/rpc/gtest_runner.cpp b/storage/src/tests/storageserver/rpc/gtest_runner.cpp new file mode 100644 index 00000000000..f3f903a8b46 --- /dev/null +++ b/storage/src/tests/storageserver/rpc/gtest_runner.cpp @@ -0,0 +1,8 @@ +// Copyright Verizon Media. 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_rpc_gtest_runner"); + +GTEST_MAIN_RUN_ALL_TESTS() |