Merge pull request #229 from yahoo/arnej/split-attribute-tests

Arnej/split attribute tests

12 files changed, 29 insertions, 24 deletions

diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt
index dcd8c86e870..0ef3b0bac18 100644
--- a/searchlib/CMakeLists.txt
+++ b/searchlib/CMakeLists.txt
@@ -68,12 +68,15 @@ vespa_define_module(
     src/tests/attribute
     src/tests/attribute/attributefilewriter
     src/tests/attribute/attributemanager
+    src/tests/attribute/benchmark
     src/tests/attribute/bitvector
+    src/tests/attribute/changevector
     src/tests/attribute/comparator
     src/tests/attribute/document_weight_iterator
     src/tests/attribute/enumeratedsave
     src/tests/attribute/enumstore
     src/tests/attribute/extendattributes
+    src/tests/attribute/guard
     src/tests/attribute/multivaluemapping
     src/tests/attribute/postinglist
     src/tests/attribute/postinglistattribute
diff --git a/searchlib/src/tests/attribute/CMakeLists.txt b/searchlib/src/tests/attribute/CMakeLists.txt
index b746dfc521d..2c0f4f2de6f 100644
--- a/searchlib/src/tests/attribute/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/CMakeLists.txt
@@ -1,11 +1,4 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_attributeguard_test_app TEST
-    SOURCES
-    attributeguard.cpp
-    DEPENDS
-    searchlib
-)
-vespa_add_test(NAME searchlib_attributeguard_test_app COMMAND sh attributeguard_test.sh)
 vespa_add_executable(searchlib_attribute_test_app TEST
     SOURCES
     attribute_test.cpp
@@ -13,17 +6,3 @@ vespa_add_executable(searchlib_attribute_test_app TEST
     searchlib
 )
 vespa_add_test(NAME searchlib_attribute_test_app COMMAND sh attribute_test.sh)
-vespa_add_executable(searchlib_changevector_test_app TEST
-    SOURCES
-    changevector_test.cpp
-    DEPENDS
-    searchlib
-)
-vespa_add_test(NAME searchlib_changevector_test_app COMMAND sh changevector_test.sh)
-vespa_add_executable(searchlib_attributebenchmark_app
-    SOURCES
-    attributebenchmark.cpp
-    DEPENDS
-    searchlib
-)
-vespa_add_test(NAME searchlib_attributebenchmark_app COMMAND searchlib_attributebenchmark_app BENCHMARK)
diff --git a/searchlib/src/tests/attribute/benchmark/CMakeLists.txt b/searchlib/src/tests/attribute/benchmark/CMakeLists.txt
new file mode 100644
index 00000000000..156d90ac1bd
--- /dev/null
+++ b/searchlib/src/tests/attribute/benchmark/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(searchlib_attributebenchmark_app
+    SOURCES
+    attributebenchmark.cpp
+    DEPENDS
+    searchlib
+)
+vespa_add_test(NAME searchlib_attributebenchmark_app COMMAND searchlib_attributebenchmark_app BENCHMARK)
diff --git a/searchlib/src/tests/attribute/attributebenchmark.cpp b/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp
index 88446ef71f7..15aff05eade 100644
--- a/searchlib/src/tests/attribute/attributebenchmark.cpp
+++ b/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp
@@ -1,9 +1,9 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/fastos/fastos.h>
-#include "attributesearcher.h"
-#include "attributeupdater.h"
+#include "../attributesearcher.h"
+#include "../attributeupdater.h"
+#include "../runnable.h"
 #include <vespa/searchlib/util/randomgenerator.h>
-#include "runnable.h"
 #include <vespa/searchlib/attribute/attribute.h>
 #include <vespa/searchlib/attribute/attributeguard.h>
 #include <vespa/searchlib/attribute/attributefactory.h>
diff --git a/searchlib/src/tests/attribute/attributebenchmark.rb b/searchlib/src/tests/attribute/benchmark/attributebenchmark.rb
index 44b08ec4389..44b08ec4389 100644
--- a/searchlib/src/tests/attribute/attributebenchmark.rb
+++ b/searchlib/src/tests/attribute/benchmark/attributebenchmark.rb
diff --git a/searchlib/src/tests/attribute/benchmarkplotter.rb b/searchlib/src/tests/attribute/benchmark/benchmarkplotter.rb
index d77c92c8acd..d77c92c8acd 100644
--- a/searchlib/src/tests/attribute/benchmarkplotter.rb
+++ b/searchlib/src/tests/attribute/benchmark/benchmarkplotter.rb
diff --git a/searchlib/src/tests/attribute/changevector/CMakeLists.txt b/searchlib/src/tests/attribute/changevector/CMakeLists.txt
new file mode 100644
index 00000000000..48c840e4e8c
--- /dev/null
+++ b/searchlib/src/tests/attribute/changevector/CMakeLists.txt
@@ -0,0 +1,7 @@
+vespa_add_executable(searchlib_changevector_test_app TEST
+    SOURCES
+    changevector_test.cpp
+    DEPENDS
+    searchlib
+)
+vespa_add_test(NAME searchlib_changevector_test_app COMMAND sh changevector_test.sh)
diff --git a/searchlib/src/tests/attribute/changevector_test.cpp b/searchlib/src/tests/attribute/changevector/changevector_test.cpp
index 9f0a796fd3e..9f0a796fd3e 100644
--- a/searchlib/src/tests/attribute/changevector_test.cpp
+++ b/searchlib/src/tests/attribute/changevector/changevector_test.cpp
diff --git a/searchlib/src/tests/attribute/changevector_test.sh b/searchlib/src/tests/attribute/changevector/changevector_test.sh
index cb70f5465a4..cb70f5465a4 100644
--- a/searchlib/src/tests/attribute/changevector_test.sh
+++ b/searchlib/src/tests/attribute/changevector/changevector_test.sh
diff --git a/searchlib/src/tests/attribute/guard/CMakeLists.txt b/searchlib/src/tests/attribute/guard/CMakeLists.txt
new file mode 100644
index 00000000000..58b04ea09e5
--- /dev/null
+++ b/searchlib/src/tests/attribute/guard/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(searchlib_attributeguard_test_app TEST
+    SOURCES
+    attributeguard.cpp
+    DEPENDS
+    searchlib
+)
+vespa_add_test(NAME searchlib_attributeguard_test_app COMMAND sh attributeguard_test.sh)
diff --git a/searchlib/src/tests/attribute/attributeguard.cpp b/searchlib/src/tests/attribute/guard/attributeguard.cpp
index 5c90caa094b..5c90caa094b 100644
--- a/searchlib/src/tests/attribute/attributeguard.cpp
+++ b/searchlib/src/tests/attribute/guard/attributeguard.cpp
diff --git a/searchlib/src/tests/attribute/attributeguard_test.sh b/searchlib/src/tests/attribute/guard/attributeguard_test.sh
index 6a9557e7da7..6a9557e7da7 100644
--- a/searchlib/src/tests/attribute/attributeguard_test.sh
+++ b/searchlib/src/tests/attribute/guard/attributeguard_test.sh