From f5c1e7c1654ab1cedb4c5de19dacd99c0ec51a80 Mon Sep 17 00:00:00 2001 From: Lorenzo Fontana Date: Thu, 5 Nov 2020 15:59:29 +0100 Subject: [PATCH] build: fix build directory for xunit tests Co-Authored-By: Leonardo Di Donato Signed-off-by: Lorenzo Fontana --- .circleci/config.yml | 4 ++-- test/run_regression_tests.sh | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5ce66f59..d9ee94af 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -283,7 +283,7 @@ jobs: name: Execute integration tests command: /usr/bin/entrypoint test - store_test_results: - path: /build/integration-tests-xunit + path: /build/release/integration-tests-xunit "tests/integration-static": docker: - image: falcosecurity/falco-tester:latest @@ -300,7 +300,7 @@ jobs: name: Execute integration tests command: /usr/bin/entrypoint test - store_test_results: - path: /build-static/integration-tests-xunit + path: /build-static/release/integration-tests-xunit "tests/driver-loader/integration": machine: image: ubuntu-1604:202004-01 diff --git a/test/run_regression_tests.sh b/test/run_regression_tests.sh index 98f389fe..bd8e61e8 100755 --- a/test/run_regression_tests.sh +++ b/test/run_regression_tests.sh @@ -104,11 +104,12 @@ function run_tests() { suites+=($SCRIPTDIR/falco_tests_package.yaml) fi - mkdir -p ${OPT_BUILD_DIR}/integration-tests-xunit + XUNIT_DIR="${OPT_BUILD_DIR}/integration-tests-xunit" + mkdir -p "${XUNIT_DIR}" for mult in "${suites[@]}"; do - XUNITFILENAME="${OPT_BUILD_DIR}/$(basename "${mult}").xml" - CMD="avocado run --xunit ${XUNITFILENAME} --mux-yaml $mult --job-results-dir $SCRIPTDIR/job-results -- $SCRIPTDIR/falco_test.py" + XUNIT_FILE_NAME="${XUNIT_DIR}/$(basename "${mult}").xml" + CMD="avocado run --xunit ${XUNIT_FILE_NAME} --mux-yaml $mult --job-results-dir $SCRIPTDIR/job-results -- $SCRIPTDIR/falco_test.py" echo "Running $CMD" BUILD_DIR=${OPT_BUILD_DIR} $CMD RC=$?