From d18e9c580fc83896810f3402652a7489f2707c3d Mon Sep 17 00:00:00 2001 From: Marc Hoersken Date: Fri, 20 Nov 2020 08:20:04 +0100 Subject: CI/cirrus: simplify logic for disabled tests The OpenSSH server instance for the testsuite cannot be started on FreeBSD, therefore the SFTP and SCP tests are disabled right away from the beginning. The previous OS version specific logic for SKIP_TESTS is no longer needed/used and can therefore be removed. Reviewed-by: Daniel Stenberg Follow up to #6211 Closes #6229 --- .cirrus.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index eb4cc9366..77efa4323 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -64,15 +64,8 @@ task: # Some tests won't run if run as root so run them as another user. # Make directories world writable so the test step can write wherever it needs. - find . -type d -exec chmod 777 {} \; - # TODO: A number of tests are failing on different FreeBSD versions and so - # are disabled. This should be investigated. - - SKIP_TESTS='' - - uname -r - - case `uname -r` in - 13.0*) SKIP_TESTS='!SFTP !SCP';; - 12.1*) SKIP_TESTS='!SFTP !SCP';; - 11.*) SKIP_TESTS='!SFTP !SCP';; - esac - - sudo -u nobody make V=1 TFLAGS="-n -a -p !flaky ${SKIP_TESTS}" test-nonflaky + # The OpenSSH server instance for the testsuite cannot be started on FreeBSD, + # therefore the SFTP and SCP tests are disabled right away from the beginning. + - sudo -u nobody make V=1 TFLAGS="-n -a -p !flaky !SFTP !SCP" test-nonflaky install_script: - make V=1 install -- cgit v1.2.1