diff options
| -rw-r--r-- | .cirrus.yml | 6 | ||||
| -rw-r--r-- | appveyor.yml | 4 | ||||
| -rw-r--r-- | tests/data/test1238 | 8 |
3 files changed, 13 insertions, 5 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 9717d349c..65f381725 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -69,9 +69,9 @@ task: - SKIP_TESTS='' - uname -r - case `uname -r` in - 13.0*) SKIP_TESTS='~1242 ~1243 ~2002 ~2003 !SFTP !SCP';; - 12.1*) SKIP_TESTS='~1242 ~1243 ~2002 ~2003 !SFTP !SCP';; - 11.3*) SKIP_TESTS='~1242 ~1243 ~2002 ~2003 !SFTP !SCP';; + 13.0*) SKIP_TESTS='!SFTP !SCP';; + 12.1*) SKIP_TESTS='!SFTP !SCP';; + 11.3*) SKIP_TESTS='!SFTP !SCP';; esac - sudo -u nobody make V=1 TFLAGS="-n -a -p !flaky ${SKIP_TESTS}" test-nonflaky install_script: diff --git a/appveyor.yml b/appveyor.yml index cd0c24fa9..5bc485a79 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -220,12 +220,12 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015" BUILD_SYSTEM: autotools TESTING: ON - DISABLED_TESTS: "!19 ~1056 !1233 ~1242 ~1243 ~2002 ~2003" + DISABLED_TESTS: "!19 ~1056 !1233" CONFIG_ARGS: "--enable-debug --enable-werror --enable-alt-svc --disable-threaded-resolver --disable-proxy" - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019" BUILD_SYSTEM: autotools TESTING: ON - DISABLED_TESTS: "!19 !504 !704 !705 ~1056 !1233 ~1242 ~1243 ~2002 ~2003" + DISABLED_TESTS: "!19 !504 !704 !705 ~1056 !1233" CONFIG_ARGS: "--enable-debug --enable-werror --enable-alt-svc --disable-threaded-resolver" install: diff --git a/tests/data/test1238 b/tests/data/test1238 index a0eef417d..1eacdf44a 100644 --- a/tests/data/test1238 +++ b/tests/data/test1238 @@ -24,6 +24,14 @@ writedelay: 2 <server> tftp </server> +# Always kill the TFTP server to not affect following tests, due +# to this test potentially keeping the TFTP server busy waiting +# for another 5 seconds after this test has already terminated. +# On some plattforms and CI not enough time passes between this +# test and the next tests 1242 and 1243, causing them to fail. +<killserver> +tftp +</killserver> <name> slow TFTP retrieve cancel due to -Y and -y </name> |