aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/data/test1503
-rw-r--r--tests/data/test1553
-rw-r--r--tests/data/test1593
-rw-r--r--tests/data/test1623
-rw-r--r--tests/data/test1693
-rw-r--r--tests/data/test1702
-rw-r--r--tests/data/test1763
-rw-r--r--tests/data/test2093
-rw-r--r--tests/data/test2133
-rw-r--r--tests/data/test673
-rw-r--r--tests/data/test683
-rw-r--r--tests/data/test693
-rw-r--r--tests/data/test703
-rw-r--r--tests/data/test813
-rw-r--r--tests/data/test893
-rw-r--r--tests/data/test903
-rw-r--r--tests/data/test913
-rwxr-xr-xtests/runtests.pl10
18 files changed, 27 insertions, 33 deletions
diff --git a/tests/data/test150 b/tests/data/test150
index b9d92383d..4afa7c22b 100644
--- a/tests/data/test150
+++ b/tests/data/test150
@@ -43,9 +43,8 @@ Finally, this is the real page!
# Client-side
<client>
-# NTLM only works if SSL-support is present
<features>
-SSL
+NTLM
</features>
<server>
http
diff --git a/tests/data/test155 b/tests/data/test155
index b72f5f043..62d680e18 100644
--- a/tests/data/test155
+++ b/tests/data/test155
@@ -63,9 +63,8 @@ Finally, this is the real page!
# Client-side
<client>
-# NTLM only works if SSL-support is present
<features>
-SSL
+NTLM
</features>
<server>
http
diff --git a/tests/data/test159 b/tests/data/test159
index f8a2e4d03..1fd60c5a7 100644
--- a/tests/data/test159
+++ b/tests/data/test159
@@ -43,9 +43,8 @@ Finally, this is the real page!
# Client-side
<client>
-# NTLM only works if SSL-support is present
<features>
-SSL
+NTLM
</features>
<server>
http
diff --git a/tests/data/test162 b/tests/data/test162
index 1c9205965..03ffc02d0 100644
--- a/tests/data/test162
+++ b/tests/data/test162
@@ -14,9 +14,8 @@ isn't because there's no Proxy-Authorization: NTLM header
# Client-side
<client>
-# NTLM only works if SSL-support is present
<features>
-SSL
+NTLM
</features>
<server>
http
diff --git a/tests/data/test169 b/tests/data/test169
index 5cfc8b743..3ae9e9048 100644
--- a/tests/data/test169
+++ b/tests/data/test169
@@ -64,9 +64,8 @@ Welcome to the end station
<server>
http
</server>
-# NTLM only works if we are built with SSL
<features>
-SSL
+NTLM
</features>
<name>
HTTP with proxy-requiring-NTLM to site-requiring-Digest
diff --git a/tests/data/test170 b/tests/data/test170
index 1eb9c8be1..d8c6494d0 100644
--- a/tests/data/test170
+++ b/tests/data/test170
@@ -8,7 +8,7 @@
http
</server>
<features>
-SSL
+NTLM
</features>
<name>
HTTP POST with --proxy-ntlm and no SSL with no response
diff --git a/tests/data/test176 b/tests/data/test176
index 0a35340d8..2fed0eded 100644
--- a/tests/data/test176
+++ b/tests/data/test176
@@ -35,9 +35,8 @@ content for you
# Client-side
<client>
-# require SSL since we need that for NTLM
<features>
-SSL
+NTLM
</features>
<server>
http
diff --git a/tests/data/test209 b/tests/data/test209
index 5aa6e14aa..e915ddd73 100644
--- a/tests/data/test209
+++ b/tests/data/test209
@@ -62,9 +62,8 @@ daniel
<server>
http
</server>
-# NTLM requires SSL
<features>
-SSL
+NTLM
</features>
<name>
HTTP proxy CONNECT auth NTLM
diff --git a/tests/data/test213 b/tests/data/test213
index 64f52cfe4..6ec4933fc 100644
--- a/tests/data/test213
+++ b/tests/data/test213
@@ -62,9 +62,8 @@ daniel
<server>
http
</server>
-# NTLM requires SSL
<features>
-SSL
+NTLM
</features>
<name>
HTTP proxy CONNECT auth NTLM and then POST
diff --git a/tests/data/test67 b/tests/data/test67
index 9462ca8bb..92bf5e549 100644
--- a/tests/data/test67
+++ b/tests/data/test67
@@ -43,9 +43,8 @@ Finally, this is the real page!
# Client-side
<client>
-# NTLM only works if SSL-support is present
<features>
-SSL
+NTLM
</features>
<server>
http
diff --git a/tests/data/test68 b/tests/data/test68
index e45b278a2..fcc9a76d5 100644
--- a/tests/data/test68
+++ b/tests/data/test68
@@ -45,9 +45,8 @@ Wrong password dude. Get it fixed and return.
# Client-side
<client>
-# NTLM only works if SSL-support is present
<features>
-SSL
+NTLM
</features>
<server>
http
diff --git a/tests/data/test69 b/tests/data/test69
index 2ea9c7fdb..7086776bf 100644
--- a/tests/data/test69
+++ b/tests/data/test69
@@ -58,9 +58,8 @@ Finally, this is the real page!
# Client-side
<client>
-# NTLM only works if SSL-support is present
<features>
-SSL
+NTLM
</features>
<server>
http
diff --git a/tests/data/test70 b/tests/data/test70
index 9ca829c68..14d7fd785 100644
--- a/tests/data/test70
+++ b/tests/data/test70
@@ -42,9 +42,8 @@ This IS the real page!
# Client-side
<client>
-# NTLM only works if SSL-support is present
<features>
-SSL
+NTLM
</features>
<server>
http
diff --git a/tests/data/test81 b/tests/data/test81
index 7107392a4..13480c8d6 100644
--- a/tests/data/test81
+++ b/tests/data/test81
@@ -41,9 +41,8 @@ Finally, this is the real page!
# Client-side
<client>
-# NTLM only works if SSL-support is present
<features>
-SSL
+NTLM
</features>
<server>
http
diff --git a/tests/data/test89 b/tests/data/test89
index be965f710..4ec3b47a8 100644
--- a/tests/data/test89
+++ b/tests/data/test89
@@ -75,9 +75,8 @@ Finally, this is the real page!
# Client-side
<client>
-# NTLM only works if SSL-support is present
<features>
-SSL
+NTLM
</features>
<server>
http
diff --git a/tests/data/test90 b/tests/data/test90
index 50e58b6cc..adf81e280 100644
--- a/tests/data/test90
+++ b/tests/data/test90
@@ -109,9 +109,8 @@ Finally, this is the real page!
# Client-side
<client>
-# NTLM only works if SSL-support is present
<features>
-SSL
+NTLM
</features>
<server>
http
diff --git a/tests/data/test91 b/tests/data/test91
index 3232744e8..98d693818 100644
--- a/tests/data/test91
+++ b/tests/data/test91
@@ -61,9 +61,8 @@ Finally, this is the real page!
# Client-side
<client>
-# NTLM only works if SSL-support is present
<features>
-SSL
+NTLM
</features>
<server>
http
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 1f92de9ff..cde28a2d8 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -115,6 +115,7 @@ my $http_ipv6; # set if HTTP server has IPv6 support
my $has_ipv6; # set if libcurl is built with IPv6 support
my $has_libz; # set if libcurl is built with libz support
my $has_getrlimit; # set if system has getrlimit()
+my $has_ntlm; # set if libcurl is built with NTLM support
my $skipped=0; # number of tests skipped; reported in main loop
my %skipped; # skipped{reason}=counter, reasons for skip
@@ -819,6 +820,10 @@ sub checkcurl {
if($feat =~ /libz/i) {
$has_libz = 1;
}
+ if($feat =~ /NTLM/i) {
+ # NTLM enabled
+ $has_ntlm=1;
+ }
}
}
if(!$curl) {
@@ -963,6 +968,11 @@ sub singletest {
next;
}
}
+ elsif($f eq "NTLM") {
+ if($has_ntlm) {
+ next;
+ }
+ }
elsif($f eq "getrlimit") {
if($has_getrlimit) {
next;