diff options
| -rw-r--r-- | searchcore/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | searchcore/src/tests/proton/config/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | searchcore/src/tests/proton/proton_config_fetcher/.cvsignore (renamed from searchcore/src/tests/proton/config/.cvsignore) | 0 | ||||
| -rw-r--r-- | searchcore/src/tests/proton/proton_config_fetcher/.gitignore (renamed from searchcore/src/tests/proton/config/.gitignore) | 0 | ||||
| -rw-r--r-- | searchcore/src/tests/proton/proton_config_fetcher/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp (renamed from searchcore/src/tests/proton/config/config_test.cpp) | 0 |
6 files changed, 10 insertions, 10 deletions
diff --git a/searchcore/CMakeLists.txt b/searchcore/CMakeLists.txt index 273ae940770..5634cde969e 100644 --- a/searchcore/CMakeLists.txt +++ b/searchcore/CMakeLists.txt @@ -74,7 +74,6 @@ vespa_define_module( src/tests/proton/common/document_type_inspector src/tests/proton/common/hw_info_sampler src/tests/proton/common/state_reporter_utils - src/tests/proton/config src/tests/proton/docsummary src/tests/proton/document_iterator src/tests/proton/documentdb @@ -120,6 +119,7 @@ vespa_define_module( src/tests/proton/persistenceconformance src/tests/proton/persistenceengine src/tests/proton/proton + src/tests/proton/proton_config_fetcher src/tests/proton/proton_configurer src/tests/proton/reference/gid_to_lid_change_handler src/tests/proton/reference/gid_to_lid_change_listener diff --git a/searchcore/src/tests/proton/config/CMakeLists.txt b/searchcore/src/tests/proton/config/CMakeLists.txt deleted file mode 100644 index fead8787d37..00000000000 --- a/searchcore/src/tests/proton/config/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchcore_config_test_app TEST - SOURCES - config_test.cpp - DEPENDS - searchcore_server - searchcore_fconfig -) -vespa_add_test(NAME searchcore_config_test_app COMMAND searchcore_config_test_app) diff --git a/searchcore/src/tests/proton/config/.cvsignore b/searchcore/src/tests/proton/proton_config_fetcher/.cvsignore index 13fb04d2a35..13fb04d2a35 100644 --- a/searchcore/src/tests/proton/config/.cvsignore +++ b/searchcore/src/tests/proton/proton_config_fetcher/.cvsignore diff --git a/searchcore/src/tests/proton/config/.gitignore b/searchcore/src/tests/proton/proton_config_fetcher/.gitignore index 72c49479fc1..72c49479fc1 100644 --- a/searchcore/src/tests/proton/config/.gitignore +++ b/searchcore/src/tests/proton/proton_config_fetcher/.gitignore diff --git a/searchcore/src/tests/proton/proton_config_fetcher/CMakeLists.txt b/searchcore/src/tests/proton/proton_config_fetcher/CMakeLists.txt new file mode 100644 index 00000000000..bdec36ea2ca --- /dev/null +++ b/searchcore/src/tests/proton/proton_config_fetcher/CMakeLists.txt @@ -0,0 +1,9 @@ +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(searchcore_proton_config_fetcher_test_app TEST + SOURCES + proton_config_fetcher_test.cpp + DEPENDS + searchcore_server + searchcore_fconfig +) +vespa_add_test(NAME searchcore_proton_config_fetcher_test_app COMMAND searchcore_proton_config_fetcher_test_app) diff --git a/searchcore/src/tests/proton/config/config_test.cpp b/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp index 01569cd7ba0..01569cd7ba0 100644 --- a/searchcore/src/tests/proton/config/config_test.cpp +++ b/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp |