summaryrefslogtreecommitdiffstats
path: root/searchlib
diff options
context:
space:
mode:
authorGeir Storli <geirst@verizonmedia.com>2019-09-09 13:22:45 +0000
committerGeir Storli <geirst@verizonmedia.com>2019-09-09 13:22:45 +0000
commit4f3dab0a567010fab1d4629ee7297bf2b8776262 (patch)
tree442690cce0a3f0b9053cf2de4b2df48d1c9cc8c4 /searchlib
parent60b59ca7215295d2349c0c0a9843fc4c4d559803 (diff)
Rename comparator_test.cpp -> enum_comparator_test.cpp.
Diffstat (limited to 'searchlib')
-rw-r--r--searchlib/CMakeLists.txt6
-rw-r--r--searchlib/src/tests/attribute/comparator/.gitignore4
-rw-r--r--searchlib/src/tests/attribute/comparator/CMakeLists.txt8
-rw-r--r--searchlib/src/tests/attribute/enum_comparator/.gitignore4
-rw-r--r--searchlib/src/tests/attribute/enum_comparator/CMakeLists.txt8
-rw-r--r--searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp (renamed from searchlib/src/tests/attribute/comparator/comparator_test.cpp)2
6 files changed, 16 insertions, 16 deletions
diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt
index 5d3ee9d457d..9e997443343 100644
--- a/searchlib/CMakeLists.txt
+++ b/searchlib/CMakeLists.txt
@@ -67,19 +67,19 @@ vespa_define_module(
src/tests/aggregator
src/tests/alignment
src/tests/attribute
+ src/tests/attribute/attribute_operation
src/tests/attribute/attributefilewriter
src/tests/attribute/attributemanager
- src/tests/attribute/attribute_operation
src/tests/attribute/benchmark
src/tests/attribute/bitvector
src/tests/attribute/bitvector_search_cache
src/tests/attribute/changevector
src/tests/attribute/compaction
- src/tests/attribute/comparator
src/tests/attribute/document_weight_iterator
+ src/tests/attribute/enum_attribute_compaction
+ src/tests/attribute/enum_comparator
src/tests/attribute/enumeratedsave
src/tests/attribute/enumstore
- src/tests/attribute/enum_attribute_compaction
src/tests/attribute/extendattributes
src/tests/attribute/guard
src/tests/attribute/imported_attribute_vector
diff --git a/searchlib/src/tests/attribute/comparator/.gitignore b/searchlib/src/tests/attribute/comparator/.gitignore
deleted file mode 100644
index 51c5b5944c9..00000000000
--- a/searchlib/src/tests/attribute/comparator/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.depend
-Makefile
-comparator_test
-searchlib_comparator_test_app
diff --git a/searchlib/src/tests/attribute/comparator/CMakeLists.txt b/searchlib/src/tests/attribute/comparator/CMakeLists.txt
deleted file mode 100644
index 6c476e73288..00000000000
--- a/searchlib/src/tests/attribute/comparator/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_comparator_test_app TEST
- SOURCES
- comparator_test.cpp
- DEPENDS
- searchlib
-)
-vespa_add_test(NAME searchlib_comparator_test_app COMMAND searchlib_comparator_test_app)
diff --git a/searchlib/src/tests/attribute/enum_comparator/.gitignore b/searchlib/src/tests/attribute/enum_comparator/.gitignore
new file mode 100644
index 00000000000..cf17b3d9423
--- /dev/null
+++ b/searchlib/src/tests/attribute/enum_comparator/.gitignore
@@ -0,0 +1,4 @@
+.depend
+Makefile
+enum_comparator_test
+searchlib_enum_comparator_test_app
diff --git a/searchlib/src/tests/attribute/enum_comparator/CMakeLists.txt b/searchlib/src/tests/attribute/enum_comparator/CMakeLists.txt
new file mode 100644
index 00000000000..440d0a391c9
--- /dev/null
+++ b/searchlib/src/tests/attribute/enum_comparator/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_enum_comparator_test_app TEST
+ SOURCES
+ enum_comparator_test.cpp
+ DEPENDS
+ searchlib
+)
+vespa_add_test(NAME searchlib_enum_comparator_test_app COMMAND searchlib_enum_comparator_test_app)
diff --git a/searchlib/src/tests/attribute/comparator/comparator_test.cpp b/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp
index d935aaa30d2..34f8833f9be 100644
--- a/searchlib/src/tests/attribute/comparator/comparator_test.cpp
+++ b/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp
@@ -1,6 +1,6 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/log/log.h>
-LOG_SETUP("comparator_test");
+LOG_SETUP("enum_comparator_test");
#include <vespa/searchlib/attribute/enumcomparator.h>
#include <vespa/vespalib/btree/btreeroot.h>