tests: disable SMTP UTF-8 tests on Windows

Fixes #4988
Closes #4992

diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT
index 6c6f83dba5973d64775149e1fa37f54886f208f1..42ebe287168f9f88e9d2efeb4e2f899bdcf08ccd 100644 (file)
--- a/tests/FILEFORMAT
+++ b/tests/FILEFORMAT
@@ -216,6 +216,7 @@ SKIPPED.
 
 Features testable here are:
 
+alt-svc
 crypto
 debug
 getrlimit
@@ -226,6 +227,7 @@ idn
 ipv6
 Kerberos
 large_file
+ld_preload
 libz
 manual
 Metalink
@@ -238,14 +240,13 @@ SPNEGO
 SSL
 SSLpinning
 SSPI
+threaded-resolver
 TLS-SRP
 TrackMemory
-threaded-resolver
 unittest
 unix-sockets
+win32
 WinSSL
-ld_preload
-alt-svc
 
 as well as each protocol that curl supports.  A protocol only needs to be
 specified if it is different from the server (useful when the server

diff --git a/tests/data/test955 b/tests/data/test955
index ce7ef18b08b06289b0689b3799dcb089dfa19ac1..57d618c7d38d126794b5ef854f71756733170ebd 100644 (file)
--- a/tests/data/test955
+++ b/tests/data/test955
@@ -16,6 +16,9 @@ SMTP
 <server>
 smtp
 </server>
+<features>
+!win32
+</features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8

diff --git a/tests/data/test956 b/tests/data/test956
index 51a978e925bf1cd35d0acfd032bde5cc4df2f954..7fc9bc9afb38251faa42d845215a28b219190a73 100644 (file)
--- a/tests/data/test956
+++ b/tests/data/test956
@@ -16,6 +16,9 @@ SMTP
 <server>
 smtp
 </server>
+<features>
+!win32
+</features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8

diff --git a/tests/data/test957 b/tests/data/test957
index ceb092f6cd6be11b2808c7f26736d7c33c3407f6..28c9c478a2c8fe0261e1c01eba56f696db19c1ad 100644 (file)
--- a/tests/data/test957
+++ b/tests/data/test957
@@ -17,6 +17,9 @@ VRFY
 <server>
 smtp
 </server>
+<features>
+!win32
+</features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8

diff --git a/tests/data/test958 b/tests/data/test958
index 7f974b8b5f8388bddcf0c8508264839319f9abd4..66ba414cbba7e495c5d7f3b9afe4d9e94adad76f 100644 (file)
--- a/tests/data/test958
+++ b/tests/data/test958
@@ -17,6 +17,9 @@ VRFY
 <server>
 smtp
 </server>
+<features>
+!win32
+</features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8

diff --git a/tests/data/test959 b/tests/data/test959
index 1de523cb305674f2795523b8bf01d875aebb1431..a61c3d14294ece93d057f952c2ad3608a3991842 100644 (file)
--- a/tests/data/test959
+++ b/tests/data/test959
@@ -18,6 +18,7 @@ smtp
 </server>
 <features>
 !idn
+!win32
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8

diff --git a/tests/data/test960 b/tests/data/test960
index ac7ee5f5f4eb22470a803a260ae95863750facc5..32834cda0867246a21228a3d6780a78930aa015e 100644 (file)
--- a/tests/data/test960
+++ b/tests/data/test960
@@ -18,6 +18,7 @@ smtp
 </server>
 <features>
 !idn
+!win32
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8

diff --git a/tests/data/test961 b/tests/data/test961
index 2e70cb404a6c86fcd5ce40cc869da7d5fe52d851..2148a0ce551aed9df31302f5d4b00c867193f0b2 100644 (file)
--- a/tests/data/test961
+++ b/tests/data/test961
@@ -19,6 +19,7 @@ smtp
 </server>
 <features>
 !idn
+!win32
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8

diff --git a/tests/data/test965 b/tests/data/test965
index 4edfd7827c7c56c46b69b935b0daf421fddb4e2d..8c93bc0c8541e6a23e8ed10e68c03c04e78a4195 100644 (file)
--- a/tests/data/test965
+++ b/tests/data/test965
@@ -22,6 +22,7 @@ smtp
 </server>
 <features>
 idn
+!win32
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8

diff --git a/tests/data/test966 b/tests/data/test966
index 6dc839aba7bde6e538379786b4c28efec957f55f..499fdda612a88026217d89f27768f1e265caf7ec 100644 (file)
--- a/tests/data/test966
+++ b/tests/data/test966
@@ -22,6 +22,7 @@ smtp
 </server>
 <features>
 idn
+!win32
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8

diff --git a/tests/data/test967 b/tests/data/test967
index da9e01e77624dcc884086763abe1f352495056bb..2813f508ba150c452ee512b1783a5b1d6094d00c 100644 (file)
--- a/tests/data/test967
+++ b/tests/data/test967
@@ -26,6 +26,7 @@ smtp
 </server>
 <features>
 idn
+!win32
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8

diff --git a/tests/data/test968 b/tests/data/test968
index 5d827c91ce1e0d4bfaee66ce1dc8023cec6b8582..ca58970c280c67bedf7c9da16d17a69cc214db78 100644 (file)
--- a/tests/data/test968
+++ b/tests/data/test968
@@ -23,6 +23,7 @@ smtp
 </server>
 <features>
 idn
+!win32
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8

diff --git a/tests/data/test969 b/tests/data/test969
index 0df81d3259a6ff5dd6ceeb45dbf780655ea00b72..9d3fa93e8eb4f857c459a0c38fdf684bb865f96a 100644 (file)
--- a/tests/data/test969
+++ b/tests/data/test969
@@ -29,6 +29,7 @@ smtp
 </server>
 <features>
 idn
+!win32
 </features>
  <name>
 SMTP mailing list EXPN (CUSTOMREQUEST) with SMTPUTF8 support

diff --git a/tests/runtests.pl b/tests/runtests.pl
index e867f2d95351db760bb788d16d6677b36de37080..bc25dfed3f9e52cb7b9f09a1fad469f32128dfef 100755 (executable)
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -243,6 +243,7 @@ my $has_altsvc;     # set if libcurl is built with alt-svc support
 my $has_ldpreload;  # set if curl is built for systems supporting LD_PRELOAD
 my $has_multissl;   # set if curl is build with MultiSSL support
 my $has_manual;     # set if curl is built with built-in manual
+my $has_win32;      # set if curl is built for Windows
 
 # this version is decided by the particular nghttp2 library that is being used
 my $h2cver = "h2c";
@@ -2639,6 +2640,7 @@ sub setupfeatures {
     $feature{"alt-svc"} = $has_altsvc;
     $feature{"manual"} = $has_manual;
     $feature{"unix-sockets"} = $has_unix;
+    $feature{"win32"} = $has_win32;
 
     # make each protocol an enabled "feature"
     for my $p (@protocols) {
@@ -2718,6 +2720,7 @@ sub checksystem {
                 # Win32-style path.
                 $pwd = pathhelp::sys_native_current_path();
                 $has_textaware = 1;
+                $has_win32 = 1;
             }
            if ($libcurl =~ /(winssl|schannel)/i) {
                $has_winssl=1;