Make NTLM tests depend on the NTLM feature at not SSL, since the NTLM support

is no longer only present when built with SSL support.

diff --git a/tests/data/test150 b/tests/data/test150
index b9d92383df66dc687933a9b1b7739b53efc700d7..4afa7c22b73a1fbf344938fb44f0fdf5df379176 100644 (file)
--- 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 b72f5f04398c28ae89b14a06406bba4362ec824b..62d680e18b6d6a3df920cae355eb21897aa6b3c0 100644 (file)
--- 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 f8a2e4d0380bab61749733a99fcbc6cf16c53965..1fd60c5a7a85447f379bfef7be0d88918e2e7c62 100644 (file)
--- 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 1c9205965d097e86e756c2c41867f9fc5a1ed3d6..03ffc02d0f8ef6fd53d292722615f6da61280885 100644 (file)
--- 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 5cfc8b743bfebf4726bca43c792633bc3b3263aa..3ae9e90483fd418e942afe78b37d860b73bbc06b 100644 (file)
--- 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 1eb9c8be1e286b0bdb72b99c1a855f7fd5b8172f..d8c6494d06643ffd4442474f0d6dff7d5c3596fd 100644 (file)
--- 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 0a35340d88aa310aad29e3ec25e8f950daf65a03..2fed0ededf0b9c2209eb6e17990df0c761e26641 100644 (file)
--- 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 5aa6e14aae64fd8562c6efeaf415dc8eb83d519d..e915ddd73b43e3ca23827da0b5dd0e9d5743affa 100644 (file)
--- 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 64f52cfe48dfcc20265aecc35b8add4f22176f8d..6ec4933fc6e3bc1e26d4468aa24c68d43711a186 100644 (file)
--- 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 9462ca8bbcdc0d9129eaeb907f766d6b96fceba1..92bf5e5497556c588f5907ad696b30e3484a3e71 100644 (file)
--- 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 e45b278a269a0afa2bba6c0c9e24d79b43e97752..fcc9a76d5adf79a09e7212ee12425d44522b69ff 100644 (file)
--- 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 2ea9c7fdbdf3eea4973f7337be14b6ce8d263d6c..7086776bfafa29980048a699f3c5eea6bd788b03 100644 (file)
--- 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 9ca829c68d15450f939aa1418b621cd85430134c..14d7fd7859574191976f3c8109e08608574ee6e2 100644 (file)
--- 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 7107392a4a582dc27d3c995d4a6ccd399f6b398d..13480c8d6f6cb3b8bb5bf5bb969626c438e26cc3 100644 (file)
--- 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 be965f710a1a5ff2ac627d9c997670d447a1f997..4ec3b47a875210ff58544d17d05756fd17f51cb6 100644 (file)
--- 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 50e58b6cc5844e795c8044ba7402bad0c4a0d0db..adf81e280d2ae80704c9e7c06b9a6f8187cbd356 100644 (file)
--- 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 3232744e865a4e41ac2ae1ce2e60e2b076744c99..98d69381892d2ef30a7c4e0ffb3b694ad8ab380a 100644 (file)
--- 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 1f92de9ff7a35d19c80edec79d64606a49fcdd40..cde28a2d8430d1132e172cc9b38d5f8bc322b6a0 100755 (executable)
--- 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;