From 0f6f73dc4be478037588d8c19b23e79b75e62b46 Mon Sep 17 00:00:00 2001 From: Ajrat Makhmutov Date: Tue, 12 Mar 2024 20:05:04 +0300 Subject: [PATCH] add $BENCH_BUILD_DIR in tests needed to run tests from specific build directory --- external/tests/run.sh | 3 ++- external/tests/tools/downloader_test.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/external/tests/run.sh b/external/tests/run.sh index 5e2f6f3..527cadd 100755 --- a/external/tests/run.sh +++ b/external/tests/run.sh @@ -16,6 +16,7 @@ export BENCH_NUM=${BENCH_NUM:-10000} export BENCH_ROOT_DIR=${BENCH_ROOT_DIR:-${ROOT_DIR}/build/tests/} export TOOL_DIR=${SCRIPT_DIR}/tools/ export CONFIG_DIR=${BENCH_ROOT_DIR}config/ +export BENCH_BUILD_DIR=${BENCH_BUILD_DIR:-${ROOT_DIR}/build/} export BENCH_HTDOCS_DIR=${BENCH_HTDOCS_DIR:-${ROOT_DIR}/htdocs/} export BENCH_WORK_DIR=${BENCH_WORK_DIR:-${ROOT_DIR}/workdir/} export BENCH_RESULTS_DIR=${BENCH_RESULTS_DIR:-${BENCH_ROOT_DIR}logs/} @@ -51,7 +52,7 @@ fi $TOOL_DIR/temp_files.sh rm -f ${BENCH_TEST_LOG_DIR}/access.log -${ROOT_DIR}build/$BENCH_BINARY_NAME --workdir ${ROOT_DIR} --config ${CONFIG_DIR}main.lua --log ${BENCH_RESULTS_DIR}server.log --logdir ${BENCH_TEST_LOG_DIR} & +$BENCH_BUILD_DIR/$BENCH_BINARY_NAME --workdir ${ROOT_DIR} --config ${CONFIG_DIR}main.lua --log ${BENCH_RESULTS_DIR}server.log --logdir ${BENCH_TEST_LOG_DIR} & PID=$! sleep 1 diff --git a/external/tests/tools/downloader_test.sh b/external/tests/tools/downloader_test.sh index f77ada3..283f6d0 100644 --- a/external/tests/tools/downloader_test.sh +++ b/external/tests/tools/downloader_test.sh @@ -8,7 +8,7 @@ check_output () { echo "Download $url to $out_file '${HOST_URL}:${file_url}'" - $ROOT_DIR/build/$BENCH_BINARY_NAME -V -do $url $out_file + $BENCH_BUILD_DIR/$BENCH_BINARY_NAME -V -do $url $out_file RET_CODE=$? if [ $RET_CODE -ne 0 ]; then -- GitLab