diff options
Diffstat (limited to 'searchlib/src/tests/memoryindex')
-rw-r--r-- | searchlib/src/tests/memoryindex/memory_index/.gitignore | 3 | ||||
-rw-r--r-- | searchlib/src/tests/memoryindex/memory_index/CMakeLists.txt | 8 | ||||
-rw-r--r-- | searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp (renamed from searchlib/src/tests/memoryindex/memoryindex/memoryindex_test.cpp) | 10 | ||||
-rw-r--r-- | searchlib/src/tests/memoryindex/memoryindex/.gitignore | 5 | ||||
-rw-r--r-- | searchlib/src/tests/memoryindex/memoryindex/CMakeLists.txt | 8 |
5 files changed, 16 insertions, 18 deletions
diff --git a/searchlib/src/tests/memoryindex/memory_index/.gitignore b/searchlib/src/tests/memoryindex/memory_index/.gitignore new file mode 100644 index 00000000000..6ec9ccf5015 --- /dev/null +++ b/searchlib/src/tests/memoryindex/memory_index/.gitignore @@ -0,0 +1,3 @@ +.depend +Makefile +searchlib_memory_index_test_app diff --git a/searchlib/src/tests/memoryindex/memory_index/CMakeLists.txt b/searchlib/src/tests/memoryindex/memory_index/CMakeLists.txt new file mode 100644 index 00000000000..d6b6691f05d --- /dev/null +++ b/searchlib/src/tests/memoryindex/memory_index/CMakeLists.txt @@ -0,0 +1,8 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(searchlib_memory_index_test_app TEST + SOURCES + memory_index_test.cpp + DEPENDS + searchlib +) +vespa_add_test(NAME searchlib_memory_index_test_app COMMAND searchlib_memory_index_test_app) diff --git a/searchlib/src/tests/memoryindex/memoryindex/memoryindex_test.cpp b/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp index 9de6ac9f310..50f44074683 100644 --- a/searchlib/src/tests/memoryindex/memoryindex/memoryindex_test.cpp +++ b/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp @@ -2,24 +2,24 @@ #include <vespa/vespalib/testkit/testapp.h> -#include <vespa/searchlib/memoryindex/memoryindex.h> +#include <vespa/searchlib/common/scheduletaskcallback.h> +#include <vespa/searchlib/common/sequencedtaskexecutor.h> #include <vespa/searchlib/fef/matchdata.h> #include <vespa/searchlib/fef/matchdatalayout.h> #include <vespa/searchlib/fef/termfieldmatchdata.h> #include <vespa/searchlib/index/docbuilder.h> +#include <vespa/searchlib/memoryindex/memory_index.h> #include <vespa/searchlib/query/tree/simplequery.h> #include <vespa/searchlib/queryeval/booleanmatchiteratorwrapper.h> +#include <vespa/searchlib/queryeval/fake_requestcontext.h> #include <vespa/searchlib/queryeval/fake_search.h> #include <vespa/searchlib/queryeval/fake_searchable.h> -#include <vespa/searchlib/queryeval/fake_requestcontext.h> #include <vespa/searchlib/queryeval/searchiterator.h> #include <vespa/vespalib/util/stringfmt.h> -#include <vespa/searchlib/common/sequencedtaskexecutor.h> -#include <vespa/searchlib/common/scheduletaskcallback.h> #include <vespa/vespalib/util/threadstackexecutor.h> #include <vespa/log/log.h> -LOG_SETUP("memoryindex_test"); +LOG_SETUP("memory_index_test"); using document::Document; using document::FieldValue; diff --git a/searchlib/src/tests/memoryindex/memoryindex/.gitignore b/searchlib/src/tests/memoryindex/memoryindex/.gitignore deleted file mode 100644 index 174d0a494e2..00000000000 --- a/searchlib/src/tests/memoryindex/memoryindex/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -.depend -Makefile -memoryindex_test -sourceselectorwriter_test -searchlib_memoryindex_test_app diff --git a/searchlib/src/tests/memoryindex/memoryindex/CMakeLists.txt b/searchlib/src/tests/memoryindex/memoryindex/CMakeLists.txt deleted file mode 100644 index 20f526e5c99..00000000000 --- a/searchlib/src/tests/memoryindex/memoryindex/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchlib_memoryindex_test_app TEST - SOURCES - memoryindex_test.cpp - DEPENDS - searchlib -) -vespa_add_test(NAME searchlib_memoryindex_test_app COMMAND searchlib_memoryindex_test_app) |