diff options
| author | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-08-23 21:09:39 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-08-23 21:09:39 +0200 |
| commit | f96cc4fbee54a771e8d432e1842739a012b29148 (patch) | |
| tree | 3758aabe9c7f0135f2b8cb67013a104c3c628eb1 /logd | |
| parent | ee484e4b7c324485dcff2f65d8329fbd16aba009 (diff) | |
Fix logrotate test. Remove benchmark that is not a test to be run.
Diffstat (limited to 'logd')
| -rw-r--r-- | logd/src/tests/rotate/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | logd/src/tests/rotate/rotate_test.sh | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/logd/src/tests/rotate/CMakeLists.txt b/logd/src/tests/rotate/CMakeLists.txt index 0398b14bcf4..2923250441b 100644 --- a/logd/src/tests/rotate/CMakeLists.txt +++ b/logd/src/tests/rotate/CMakeLists.txt @@ -9,4 +9,4 @@ vespa_add_executable(logd_dummylogger_app dummylogger.cpp DEPENDS ) -vespa_add_test(NAME logd_rotate_test NO_VALGRIND COMMAND sh rotate_test.sh BENCHMARK) +vespa_add_test(NAME logd_rotate_test NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/rotate_test.sh BENCHMARK) diff --git a/logd/src/tests/rotate/rotate_test.sh b/logd/src/tests/rotate/rotate_test.sh index 5c968e25ba7..2af4d92e078 100755 --- a/logd/src/tests/rotate/rotate_test.sh +++ b/logd/src/tests/rotate/rotate_test.sh @@ -2,6 +2,10 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. set -e +if [ -z "$SOURCE_DIRECTORY" ]; then + SOURCE_DIRECTORY="." +fi + export VESPA_LOG_TARGET=file:vespa.log rm -rf vespa.log* @@ -11,8 +15,7 @@ echo $! > dummyserver.pid sleep 5 -./create_configfile.sh - +$SOURCE_DIRECTORY/create_configfile.sh export VESPA_CONFIG_ID=file:logd.cfg ../../apps/logd/logd & |