From adae075fcffe0b5d1a790c41c083b78db27ba80b Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Tue, 7 Feb 2023 09:27:51 +0100 Subject: ci: remove unnecessary variables and functions (#22150) --- ci/common/suite.sh | 5 ----- 1 file changed, 5 deletions(-) (limited to 'ci/common/suite.sh') diff --git a/ci/common/suite.sh b/ci/common/suite.sh index c81261d2e7..9c3056baaf 100644 --- a/ci/common/suite.sh +++ b/ci/common/suite.sh @@ -34,8 +34,3 @@ ended_successfully() { fi return 0 } - -end_tests() { - touch "${END_MARKER}" - ended_successfully -} -- cgit From 0fc9a232e09d1b246b2d6bb5b862e63aa623e825 Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Wed, 8 Feb 2023 16:21:50 +0100 Subject: ci: remove unnecessary END_MARKER variable (#22171) --- ci/common/suite.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'ci/common/suite.sh') diff --git a/ci/common/suite.sh b/ci/common/suite.sh index 9c3056baaf..d13546823b 100644 --- a/ci/common/suite.sh +++ b/ci/common/suite.sh @@ -1,8 +1,6 @@ -# Test success marker. If END_MARKER file exists, we know that all tests -# finished. If FAIL_SUMMARY_FILE exists we know that some tests failed, this -# file will contain information about failed tests. Build is considered -# successful if tests ended without any of them failing. -END_MARKER="$BUILD_DIR/.tests_finished" +# If FAIL_SUMMARY_FILE exists we know that some tests failed, this file will +# contain information about failed tests. Build is considered successful if +# tests ended without any of them failing. FAIL_SUMMARY_FILE="$BUILD_DIR/.test_errors" fail() { @@ -28,9 +26,5 @@ ended_successfully() { return 1 fi - if ! test -f "${END_MARKER}" ; then - echo 'ended_successfully called before end marker was touched' - return 1 - fi return 0 } -- cgit From 2294210660056df2f8abb277776cfd68f3fb1156 Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Wed, 8 Feb 2023 18:32:17 +0100 Subject: ci: remove fail summary (#22174) The tests already have a summary at the end, there's no need for an additional fail summary wrapper. --- ci/common/suite.sh | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 ci/common/suite.sh (limited to 'ci/common/suite.sh') diff --git a/ci/common/suite.sh b/ci/common/suite.sh deleted file mode 100644 index d13546823b..0000000000 --- a/ci/common/suite.sh +++ /dev/null @@ -1,30 +0,0 @@ -# If FAIL_SUMMARY_FILE exists we know that some tests failed, this file will -# contain information about failed tests. Build is considered successful if -# tests ended without any of them failing. -FAIL_SUMMARY_FILE="$BUILD_DIR/.test_errors" - -fail() { - local test_name="$1" - local message="$2" - - : "${message:=Test $test_name failed}" - - local full_msg="$test_name :: $message" - echo "${full_msg}" >> "${FAIL_SUMMARY_FILE}" - echo "Failed: $full_msg" - export FAILED=1 -} - -ended_successfully() { - if test -f "${FAIL_SUMMARY_FILE}" ; then - echo 'Test failed, complete summary:' - cat "${FAIL_SUMMARY_FILE}" - - if [[ "$GITHUB_ACTIONS" == "true" ]]; then - rm -f "$FAIL_SUMMARY_FILE" - fi - - return 1 - fi - return 0 -} -- cgit