diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-02-23 22:30:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-23 22:30:23 +0100 |
commit | 4a116410483e3521460527617ff50b0a65c4cb5c (patch) | |
tree | 7c28d87836d63e01b8c24fc40e42a1612e45a8d9 | |
parent | d2a5c871dcb3c572617119568c8e73592cb9439a (diff) | |
parent | 5436f106e44ec69233d06db7cb686f19f7df69ce (diff) |
Merge pull request #21357 from vespa-engine/toregge/move-btree-scan-speed-test-to-vespalib
Move btree scan speed test to vespalib.
-rw-r--r-- | searchlib/CMakeLists.txt | 1 | ||||
-rw-r--r-- | searchlib/src/tests/btree/.gitignore | 1 | ||||
-rw-r--r-- | searchlib/src/tests/btree/CMakeLists.txt | 8 | ||||
-rw-r--r-- | vespalib/CMakeLists.txt | 1 | ||||
-rw-r--r-- | vespalib/src/tests/btree/btree-scan-speed/CMakeLists.txt | 8 | ||||
-rw-r--r-- | vespalib/src/tests/btree/btree-scan-speed/btree_scan_speed_test.cpp (renamed from searchlib/src/tests/btree/scanspeed.cpp) | 0 |
6 files changed, 9 insertions, 10 deletions
diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt index de46dfa6441..a7886cc3c61 100644 --- a/searchlib/CMakeLists.txt +++ b/searchlib/CMakeLists.txt @@ -102,7 +102,6 @@ vespa_define_module( src/tests/attribute/tensorattribute src/tests/bitcompression/expgolomb src/tests/bitvector - src/tests/btree src/tests/common/bitvector src/tests/common/geogcd src/tests/common/location diff --git a/searchlib/src/tests/btree/.gitignore b/searchlib/src/tests/btree/.gitignore deleted file mode 100644 index ec4090e3658..00000000000 --- a/searchlib/src/tests/btree/.gitignore +++ /dev/null @@ -1 +0,0 @@ -searchlib_scanspeed_app diff --git a/searchlib/src/tests/btree/CMakeLists.txt b/searchlib/src/tests/btree/CMakeLists.txt deleted file mode 100644 index 556f6bf2b23..00000000000 --- a/searchlib/src/tests/btree/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchlib_scanspeed_app - SOURCES - scanspeed.cpp - DEPENDS - searchlib -) -vespa_add_test(NAME searchlib_scanspeed_app COMMAND vespalib_scanspeed_app BENCHMARK) diff --git a/vespalib/CMakeLists.txt b/vespalib/CMakeLists.txt index b90863d28d3..3e9f809fd2c 100644 --- a/vespalib/CMakeLists.txt +++ b/vespalib/CMakeLists.txt @@ -27,6 +27,7 @@ vespa_define_module( src/tests/box src/tests/btree src/tests/btree/btree_store + src/tests/btree/btree-scan-speed src/tests/btree/btree-stress src/tests/child_process src/tests/component diff --git a/vespalib/src/tests/btree/btree-scan-speed/CMakeLists.txt b/vespalib/src/tests/btree/btree-scan-speed/CMakeLists.txt new file mode 100644 index 00000000000..070753d4278 --- /dev/null +++ b/vespalib/src/tests/btree/btree-scan-speed/CMakeLists.txt @@ -0,0 +1,8 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(vespalib_btree_scan_speed_test_app + SOURCES + btree_scan_speed_test.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_btree_scan_speed_test_app COMMAND vespalib_btree_scan_speed_test_app BENCHMARK) diff --git a/searchlib/src/tests/btree/scanspeed.cpp b/vespalib/src/tests/btree/btree-scan-speed/btree_scan_speed_test.cpp index e2df9996dcb..e2df9996dcb 100644 --- a/searchlib/src/tests/btree/scanspeed.cpp +++ b/vespalib/src/tests/btree/btree-scan-speed/btree_scan_speed_test.cpp |