diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index ec04019339..c8ff79fdcf 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -312,4 +312,4 @@ stages: displayName: 'test' env: AZURE_ACCESS_TOKEN: "$(System.AccessToken)" - TFLAGS: "-ac /usr/bin/curl.exe !IDN !SCP ~612 ~1056 $(tests)" + TFLAGS: "-ac /usr/bin/curl.exe !IDN !SCP ~612 $(tests)" diff --git a/appveyor.yml b/appveyor.yml index fda46e68e9..2a52c585a6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -83,7 +83,7 @@ environment: HTTP_ONLY: OFF TESTING: ON SHARED: OFF - DISABLED_TESTS: "!1139 !1501 ~1056" + DISABLED_TESTS: "!1139 !1501" ADD_PATH: "C:\\msys64\\usr\\bin" - job_name: "CMake, VS2022, Debug x64, Schannel, Static, Unicode" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2022" @@ -97,7 +97,7 @@ environment: HTTP_ONLY: OFF TESTING: ON SHARED: OFF - DISABLED_TESTS: "~571 !1139 !1501 ~1056" + DISABLED_TESTS: "~571 !1139 !1501" ADD_PATH: "C:\\msys64\\usr\\bin" - job_name: "CMake, VS2022, Debug x64, no SSL, Static" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2022" @@ -111,7 +111,7 @@ environment: HTTP_ONLY: OFF TESTING: ON SHARED: OFF - DISABLED_TESTS: "~571 !1139 !1501 ~1056" + DISABLED_TESTS: "~571 !1139 !1501" ADD_PATH: "C:\\msys64\\usr\\bin" - job_name: "CMake, VS2022, Debug x64, no SSL, Static, HTTP only" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2022" @@ -125,7 +125,7 @@ environment: HTTP_ONLY: ON TESTING: ON SHARED: OFF - DISABLED_TESTS: "!1139 !1501 ~1056" + DISABLED_TESTS: "!1139 !1501" ADD_PATH: "C:\\msys64\\usr\\bin" # generated CMake-based MSYS Makefiles builds (mingw cross-compiling) - job_name: "CMake, mingw-w64, gcc 8, Debug x64, Schannel, Static, Unicode" @@ -139,7 +139,7 @@ environment: HTTP_ONLY: OFF TESTING: ON SHARED: OFF - DISABLED_TESTS: "!1139 !1501 ~1056" + DISABLED_TESTS: "!1139 !1501" ADD_PATH: "C:\\mingw-w64\\x86_64-8.1.0-posix-seh-rt_v6-rev0\\mingw64\\bin;C:\\msys64\\usr\\bin" MSYS2_ARG_CONV_EXCL: "/*" BUILD_OPT: -k @@ -154,7 +154,7 @@ environment: HTTP_ONLY: OFF TESTING: ON SHARED: OFF - DISABLED_TESTS: "!1139 !1501 ~1056" + DISABLED_TESTS: "!1139 !1501" ADD_PATH: "C:\\mingw-w64\\x86_64-7.2.0-posix-seh-rt_v5-rev1\\mingw64\\bin;C:\\msys64\\usr\\bin" MSYS2_ARG_CONV_EXCL: "/*" BUILD_OPT: -k @@ -184,7 +184,7 @@ environment: HTTP_ONLY: OFF TESTING: ON SHARED: OFF - DISABLED_TESTS: "!1139 !1501 ~1056" + DISABLED_TESTS: "!1139 !1501" ADD_PATH: "C:\\mingw-w64\\i686-6.3.0-posix-dwarf-rt_v5-rev1\\mingw32\\bin;C:\\msys64\\usr\\bin" MSYS2_ARG_CONV_EXCL: "/*" BUILD_OPT: -k @@ -199,7 +199,7 @@ environment: HTTP_ONLY: OFF TESTING: ON SHARED: OFF - DISABLED_TESTS: "!1139 !1501 ~1056" + DISABLED_TESTS: "!1139 !1501" ADD_PATH: "C:\\MinGW\\bin;C:\\msys64\\usr\\bin" MSYS2_ARG_CONV_EXCL: "/*" BUILD_OPT: -k @@ -272,21 +272,21 @@ environment: APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017" BUILD_SYSTEM: autotools TESTING: ON - DISABLED_TESTS: "!19 ~1056 !1233" + DISABLED_TESTS: "!19 !1233" ADD_PATH: "C:\\msys64\\usr\\bin" CONFIG_ARGS: "--enable-debug --enable-werror --disable-threaded-resolver --disable-proxy --without-ssl --enable-websockets" - job_name: "autotools, msys2, Debug, no SSL" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017" BUILD_SYSTEM: autotools TESTING: ON - DISABLED_TESTS: "!19 !504 !704 !705 ~1056 !1233" + DISABLED_TESTS: "!19 !504 !704 !705 !1233" ADD_PATH: "C:\\msys64\\usr\\bin" CONFIG_ARGS: "--enable-debug --enable-werror --disable-threaded-resolver --without-ssl --enable-websockets" - job_name: "autotools, msys2, Release, no SSL" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017" BUILD_SYSTEM: autotools TESTING: ON - DISABLED_TESTS: "!19 !504 !704 !705 ~1056 !1233" + DISABLED_TESTS: "!19 !504 !704 !705 !1233" ADD_PATH: "C:\\msys64\\usr\\bin" CONFIG_ARGS: "--enable-warnings --enable-werror --without-ssl --enable-websockets" # autotools-based Cygwin build @@ -294,7 +294,7 @@ environment: APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2022" BUILD_SYSTEM: autotools TESTING: ON - DISABLED_TESTS: "~1056" + DISABLED_TESTS: "" ADD_PATH: "C:\\cygwin64\\bin" CONFIG_ARGS: "--enable-debug --enable-werror --disable-threaded-resolver --without-ssl --enable-websockets" POSIX_PATH_PREFIX: "/cygdrive" diff --git a/tests/data/test1056 b/tests/data/test1056 index 2bf70ccfeb..b5e3fd7ebf 100644 --- a/tests/data/test1056 +++ b/tests/data/test1056 @@ -42,8 +42,14 @@ body # # Client-side +# This test relies on the IPv6 scope field being ignored when connecting to +# ipv6-localhost (i.e. [::1%259999] is treated as [::1]). Maybe this is a bit +# dodgy, but it happens on all our test platforms but Windows so skip this +# test there. This feature doesn't work on msys or Cygwin, so use a precheck +# to skip those. ipv6 +!win32 http @@ -55,6 +61,9 @@ HTTP follow redirect from IPv4 to IPv6 with scope http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L + +perl -e "print 'Test is not supported on the Windows kernel' if ($^O eq 'MSWin32' || $^O eq 'msys' || $^O eq 'cygwin');" + #