Move btree unit tests to proper location.

10 files changed, 16 insertions, 25 deletions

diff --git a/searchlib/src/tests/btree/.gitignore b/searchlib/src/tests/btree/.gitignore
index a6bdd572c7d..0cc4519cf9c 100644
--- a/searchlib/src/tests/btree/.gitignore
+++ b/searchlib/src/tests/btree/.gitignore
@@ -1,3 +1,5 @@
 iteratespeed
+searchlib_btree_test_app
 searchlib_btreeaggregation_test_app
+searchlib_frozenbtree_test_app
 searchlib_iteratespeed_app
diff --git a/searchlib/src/tests/btree/CMakeLists.txt b/searchlib/src/tests/btree/CMakeLists.txt
index dbd631ca353..9817f2b9079 100644
--- a/searchlib/src/tests/btree/CMakeLists.txt
+++ b/searchlib/src/tests/btree/CMakeLists.txt
@@ -1,4 +1,18 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(searchlib_btree_test_app TEST
+    SOURCES
+    btree_test.cpp
+    DEPENDS
+    searchlib
+)
+vespa_add_test(NAME searchlib_btree_test_app COMMAND searchlib_btree_test_app)
+vespa_add_executable(searchlib_frozenbtree_test_app TEST
+    SOURCES
+    frozenbtree_test.cpp
+    DEPENDS
+    searchlib
+)
+vespa_add_test(NAME searchlib_frozenbtree_test_app COMMAND searchlib_frozenbtree_test_app)
 vespa_add_executable(searchlib_btreeaggregation_test_app TEST
     SOURCES
     btreeaggregation_test.cpp
diff --git a/searchlib/src/tests/btree/DESC b/searchlib/src/tests/btree/DESC
deleted file mode 100644
index da074ca2c45..00000000000
--- a/searchlib/src/tests/btree/DESC
+++ /dev/null
@@ -1 +0,0 @@
-btree aggregation test. Take a look at btreeaggregation_test.cpp for details.
diff --git a/searchlib/src/tests/btree/FILES b/searchlib/src/tests/btree/FILES
deleted file mode 100644
index 45756255961..00000000000
--- a/searchlib/src/tests/btree/FILES
+++ /dev/null
@@ -1 +0,0 @@
-btreeaggregation_test.cpp
diff --git a/searchlib/src/tests/memoryindex/btree/btree_test.cpp b/searchlib/src/tests/btree/btree_test.cpp
index bd84ea09be6..bd84ea09be6 100644
--- a/searchlib/src/tests/memoryindex/btree/btree_test.cpp
+++ b/searchlib/src/tests/btree/btree_test.cpp
diff --git a/searchlib/src/tests/memoryindex/btree/frozenbtree_test.cpp b/searchlib/src/tests/btree/frozenbtree_test.cpp
index 399c20f53cc..399c20f53cc 100644
--- a/searchlib/src/tests/memoryindex/btree/frozenbtree_test.cpp
+++ b/searchlib/src/tests/btree/frozenbtree_test.cpp
diff --git a/searchlib/src/tests/memoryindex/btree/.gitignore b/searchlib/src/tests/memoryindex/btree/.gitignore
deleted file mode 100644
index 94440affa90..00000000000
--- a/searchlib/src/tests/memoryindex/btree/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.depend
-Makefile
-btree_test
-frozenbtree_test
-searchlib_btree_test_app
-searchlib_frozenbtree_test_app
diff --git a/searchlib/src/tests/memoryindex/btree/CMakeLists.txt b/searchlib/src/tests/memoryindex/btree/CMakeLists.txt
deleted file mode 100644
index 55b01f353aa..00000000000
--- a/searchlib/src/tests/memoryindex/btree/CMakeLists.txt
+++ /dev/null
@@ -1,15 +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_btree_test_app TEST
-    SOURCES
-    btree_test.cpp
-    DEPENDS
-    searchlib
-)
-vespa_add_test(NAME searchlib_btree_test_app COMMAND searchlib_btree_test_app)
-vespa_add_executable(searchlib_frozenbtree_test_app TEST
-    SOURCES
-    frozenbtree_test.cpp
-    DEPENDS
-    searchlib
-)
-vespa_add_test(NAME searchlib_frozenbtree_test_app COMMAND searchlib_frozenbtree_test_app)
diff --git a/searchlib/src/tests/memoryindex/btree/DESC b/searchlib/src/tests/memoryindex/btree/DESC
deleted file mode 100644
index 02739da7527..00000000000
--- a/searchlib/src/tests/memoryindex/btree/DESC
+++ /dev/null
@@ -1 +0,0 @@
-btree test. Take a look at btree_test.cpp for details.
diff --git a/searchlib/src/tests/memoryindex/btree/FILES b/searchlib/src/tests/memoryindex/btree/FILES
deleted file mode 100644
index e63a2f68eb4..00000000000
--- a/searchlib/src/tests/memoryindex/btree/FILES
+++ /dev/null
@@ -1 +0,0 @@
-btree_test.cpp