test: add cygwin feature and use it (test 1056, 1517)

To replace custom checks with the same effect.

Closes #18327
This commit is contained in:
Viktor Szakats 2025-08-20 20:00:49 +02:00
parent 29608d694e
commit 8fac255fc1
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
5 changed files with 11 additions and 22 deletions

View File

@ -455,6 +455,7 @@ Features testable here are:
- `codeset-utf8`. If the running codeset is UTF-8 capable.
- `cookies`
- `crypto`
- `cygwin`
- `Debug`
- `digest`
- `DoH`

View File

@ -45,10 +45,10 @@ body
# 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.
# test there. Not supported on the Windows kernel, this includes MSYS2/Cygwin.
<features>
IPv6
!cygwin
!win32
</features>
<server>
@ -61,9 +61,6 @@ HTTP follow redirect from IPv4 to IPv6 with scope
<command>
http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
</command>
<precheck>
%PERL -e "print 'Test is not supported on the Windows kernel' if($^O eq 'MSWin32' || $^O eq 'msys' || $^O eq 'cygwin');"
</precheck>
</client>
#

View File

@ -36,6 +36,11 @@ This is a virtual description of server virtual error.
# Client-side
<client>
# Windows TCP does not deliver response data but reports CONNABORTED
<features>
!cygwin
!win32
</features>
<server>
http
</server>
@ -43,12 +48,6 @@ http
<tool>
lib%TESTNUMBER
</tool>
# precheck is a command line to run before the test, to see if we can execute
# the test or not
<precheck>
%LIBTESTS lib%TESTNUMBER check
</precheck>
<name>
HTTP POST, server responds before completed send
</name>

View File

@ -61,17 +61,6 @@ static CURLcode test_lib1517(const char *URL)
struct t1517_WriteThis pooh;
if(!strcmp(URL, "check")) {
#if (defined(_WIN32) || defined(__CYGWIN__))
curl_mprintf("Windows TCP does not deliver response data but reports "
"CONNABORTED\n");
return TEST_ERR_FAILURE; /* skip since it fails on Windows without
workaround */
#else
return CURLE_OK; /* sure, run this! */
#endif
}
pooh.readptr = testdata;
pooh.sizeleft = strlen(testdata);

View File

@ -568,6 +568,9 @@ sub checksystemfeatures {
$pwd = sys_native_current_path();
$feature{"win32"} = 1;
}
if($curl =~ /cygwin|msys/i) {
$feature{"cygwin"} = 1;
}
if($libcurl =~ /\sschannel\b/i) {
$feature{"Schannel"} = 1;
$feature{"SSLpinning"} = 1;