diff options
| author | Geir Storli <geirst@verizonmedia.com> | 2020-06-10 12:18:41 +0000 |
|---|---|---|
| committer | Geir Storli <geirst@verizonmedia.com> | 2020-06-10 12:18:41 +0000 |
| commit | 6c28b0a9d51e5fd8526cae1f26f7a244829499f1 (patch) | |
| tree | 790fb28af05f8868816adaaf2638d534d1945643 /searchcore | |
| parent | 3d1b445b10f70771cf7a4bce1ba2d285c553f930 (diff) | |
Stop using script to run the attribute test.
DirectoryHandler is already used to handle creation and deletion of test folder.
Diffstat (limited to 'searchcore')
| -rw-r--r-- | searchcore/src/tests/proton/attribute/CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | searchcore/src/tests/proton/attribute/attribute_test.sh | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/searchcore/src/tests/proton/attribute/CMakeLists.txt b/searchcore/src/tests/proton/attribute/CMakeLists.txt index 79f81f3daa1..cd5318fac16 100644 --- a/searchcore/src/tests/proton/attribute/CMakeLists.txt +++ b/searchcore/src/tests/proton/attribute/CMakeLists.txt @@ -8,8 +8,8 @@ vespa_add_executable(searchcore_attribute_test_app TEST searchcore_flushengine searchcore_pcommon ) -vespa_add_test(NAME searchcore_attribute_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/attribute_test.sh - DEPENDS searchcore_attribute_test_app) +vespa_add_test(NAME searchcore_attribute_test_app COMMAND searchcore_attribute_test_app) + vespa_add_executable(searchcore_attributeflush_test_app TEST SOURCES attributeflush_test.cpp diff --git a/searchcore/src/tests/proton/attribute/attribute_test.sh b/searchcore/src/tests/proton/attribute/attribute_test.sh deleted file mode 100755 index 26aa6d5f57a..00000000000 --- a/searchcore/src/tests/proton/attribute/attribute_test.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -set -e -rm -rf test_output -$VALGRIND ./searchcore_attribute_test_app |