From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 17 Oct 2008 12:17:45 +0000 (+1300)
Subject: Author: Francesco Chemolli <kinkie@squid-cache.org>
X-Git-Tag: SQUID_3_2_0_1~1396
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c76ec3b7646eec9121a8633ff80cd3a7c3f3f105;p=thirdparty%2Fsquid.git

Author: Francesco Chemolli <kinkie@squid-cache.org>
Bug 2489: Testsuite doesn't obey authentication scheme ./configure parameters

I've added a couple of AC_DEFINEs and a couple of #ifdefs to make the
offending tests conditional on the actually-built builtin auth-methods.
---

c76ec3b7646eec9121a8633ff80cd3a7c3f3f105
diff --cc src/tests/testAuth.cc
index 9cfd4fbd2a,b2a9623c92..40b20155a6
--- a/src/tests/testAuth.cc
+++ b/src/tests/testAuth.cc
@@@ -116,13 -125,21 +125,21 @@@ fake_auth_setup(
      }
  
      params[]={ {"digest", digest_parms, 2},
 -               {"basic", basic_parms, 2},
 -               {"ntlm", ntlm_parms, 1},
 -               {"negotiate", negotiate_parms, 1}
 -             };
 +        {"basic", basic_parms, 2},
 +        {"ntlm", ntlm_parms, 1},
 +        {"negotiate", negotiate_parms, 1}
 +    };
  
-     for (unsigned scheme=0; scheme < 4; scheme++)
-         setup_scheme(getConfig(params[scheme].name), params[scheme].params, params[scheme].paramlength);
+     for (unsigned scheme=0; scheme < 4; scheme++) {
+         AuthConfig *schemeConfig;
+         schemeConfig = getConfig(params[scheme].name);
+         if (schemeConfig != NULL)
+             setup_scheme (schemeConfig, params[scheme].params, 
+                 params[scheme].paramlength);
+ 		else
+             fprintf(stderr,"Skipping unknown authentication scheme '%s'.\n", 
+                 params[scheme].name);
+     }
  
      authenticateInit(&config);
  
diff --cc src/tests/testAuth.h
index c59b09fde2,7fa7ce5c88..b1704aa0ca
--- a/src/tests/testAuth.h
+++ b/src/tests/testAuth.h
@@@ -2,8 -2,9 +2,10 @@@
  #ifndef SQUID_SRC_TEST_AUTH_H
  #define SQUID_SRC_TEST_AUTH_H
  
 -#include <cppunit/extensions/HelperMacros.h>
+ #include "config.h"
+ 
 +#include <cppunit/extensions/HelperMacros.h>
 +
  /*
   * test the auth Config framework
   */