Fix some QoS update build errors.

Also re-enables testbed testing of the QoS Features which prevented these
being caught earlier.

diff --git a/squid3.dox b/squid3.dox
index 4d6b424916def4b47eb0227d0b220239dda5e063..13b20b380117b38b62f2ee67703492bdab6e8120 100644 (file)
--- a/squid3.dox
+++ b/squid3.dox
@@ -1045,6 +1045,7 @@ PREDEFINED             = \
                        USE_WCCPv2 \
                        USE_WIN32_SERVICE \
                        USE_XPROF_STATS \
+                       USE_ZPH_QOS \
                        FOLLOW_X_FORWARDED_FOR
 
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 85423cd556f3421eb30cc36db8065a880b3c9ee3..bc7d8b91a6901bfb53804ab9947305fb0a3daf67 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1502,8 +1502,7 @@ tests_testDiskIO_SOURCES = \
        tests/testDiskIO.cc \
        tests/testDiskIO.h \
        tests/testMain.cc \
-       tests/stub_cache_manager.cc \
-       ip/stubQosConfig.cc
+       tests/stub_cache_manager.cc
 nodist_tests_testDiskIO_SOURCES= \
        $(SWAP_TEST_GEN_SOURCES)
 tests_testDiskIO_LDADD = \

diff --git a/src/forward.cc b/src/forward.cc
index 71b876d2a55066f4d37f3e3663fb063ce32cd2ac..a28dd9058ede31bc89f712677a21fca9c5daf801 100644 (file)
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -965,7 +965,7 @@ FwdState::dispatch()
 
     netdbPingSite(request->GetHost());
 
-#if USE_ZPH_QOS && _SQUID_LINUX_
+#if USE_ZPH_QOS && defined(_SQUID_LINUX_)
     /* Bug 2537: This part of ZPH only applies to patched Linux kernels. */
 
     /* Retrieves remote server TOS value, and stores it as part of the

diff --git a/src/structs.h b/src/structs.h
index c7bc3ad7245bb61b0621d5110d6517b4bfffcde2..5d3d1df27afa820ba29f98459753b7a08724d60a 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -125,7 +125,7 @@ struct relist {
 #endif
 
 #if USE_ZPH_QOS
-#include "QosConfig.h"
+#include "ip/QosConfig.h"
 #endif
 
 /* forward decl for SquidConfig, see RemovalPolicy.h */

diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts
index 59452e5aaa3bd10658d3254d43319ddd833c04fd..b9f8eadbf96485a85db7edc982091a1909b50979 100644 (file)
--- a/test-suite/buildtests/layer-02-maximus.opts
+++ b/test-suite/buildtests/layer-02-maximus.opts
@@ -33,10 +33,6 @@
 #   --enable-win32-service \
 #   --with-localhost-ipv6 \
 #
-#      AYJ: these features have known bugs. They are optional so we don't block on them...
-#      We can't test them automatically everywhere
-#
-#      --enable-zph-qos \
 #
 OPTS=" \
        --enable-loadable-modules \
@@ -91,6 +87,7 @@ OPTS=" \
        --enable-vary \
        --enable-ipv6 \
        --enable-auto-locale \
+       --enable-zph-qos \
  \
        --with-aio \
        --with-build-environment=default \