aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2020-02-27 17:33:16 +0000
committerDaniel Stenberg <daniel@haxx.se>2020-03-02 08:29:11 +0100
commitdf207d2dd93b9e73c0550f62d8034bacecffbd20 (patch)
tree189d14a891843c6083cddbcb6d46696a201ba7e1
parent0b3e3644e09a3082401ca13b366f67778afd7340 (diff)
tests: disable SMTP UTF-8 tests on Windows
Fixes #4988 Closes #4992
-rw-r--r--tests/FILEFORMAT7
-rw-r--r--tests/data/test9553
-rw-r--r--tests/data/test9563
-rw-r--r--tests/data/test9573
-rw-r--r--tests/data/test9583
-rw-r--r--tests/data/test9591
-rw-r--r--tests/data/test9601
-rw-r--r--tests/data/test9611
-rw-r--r--tests/data/test9651
-rw-r--r--tests/data/test9661
-rw-r--r--tests/data/test9671
-rw-r--r--tests/data/test9681
-rw-r--r--tests/data/test9691
-rwxr-xr-xtests/runtests.pl3
14 files changed, 27 insertions, 3 deletions
diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT
index 6c6f83dba..42ebe2871 100644
--- 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 ce7ef18b0..57d618c7d 100644
--- 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 51a978e92..7fc9bc9af 100644
--- 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 ceb092f6c..28c9c478a 100644
--- 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 7f974b8b5..66ba414cb 100644
--- 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 1de523cb3..a61c3d142 100644
--- 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 ac7ee5f5f..32834cda0 100644
--- 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 2e70cb404..2148a0ce5 100644
--- 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 4edfd7827..8c93bc0c8 100644
--- 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 6dc839aba..499fdda61 100644
--- 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 da9e01e77..2813f508b 100644
--- 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 5d827c91c..ca58970c2 100644
--- 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 0df81d325..9d3fa93e8 100644
--- 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 e867f2d95..bc25dfed3 100755
--- 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;