SourceFormat Enforcement

[thirdparty/squid.git] / test-suite / buildtests / layer-02-maximus.opts

diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts
index 2fc580582128fb6a8aca77d7ddc5ddb9fe3f790d..c2b2452760e28bb4873abed2512beb74dfc712fb 100644 (file)
--- a/test-suite/buildtests/layer-02-maximus.opts
+++ b/test-suite/buildtests/layer-02-maximus.opts
@@ -1,3 +1,10 @@
+## Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
+
 #
 # All configuration options that can be enabled are enabled,
 # XXX: with the exception of those that depend on the environment.
@@ -9,11 +16,11 @@
 MAKETEST="distcheck"
 #
 #
-# The options for this level can be easily generated semi-automatically from configure.in by:
-#      grep -E "^AC_ARG_ENABLE" ./configure.in | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >disable.opts
+# The options for this level can be easily generated semi-automatically from configure.ac by:
+#      grep -E "^AC_ARG_ENABLE" ./configure.ac | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >disable.opts
 # followed by insertion of '   --enable-' and '\' strings
 #
-#      grep -E "^AC_ARG_WITH" ./configure.in | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >without.opts
+#      grep -E "^AC_ARG_WITH" ./configure.ac | grep -o -E "[0-9a-z\-]+[,]" | grep -o -E "[^,]+" >without.opts
 # followed by insertion of '   --with-' and ' \' strings
 #
 # sometimes it's just too automatic..
@@ -22,10 +29,8 @@ MAKETEST="distcheck"
 #
 #   --with-default-user=NAME \
 #   --with-aufs-threads=N \
-#   --with-coss-membuf-size=N \
 #   --with-filedescriptors=N \
 #   --with-cppunit-basedir=PATH \
-#   --with-openssl=PATH \
 #   --with-po2html=PATH \
 #   --with-tags=TAGS \
 #
@@ -37,9 +42,15 @@ MAKETEST="distcheck"
 #   --enable-epoll \
 #   --enable-kqueue \
 #   --enable-win32-service \
+#   --with-valgrind-debug \
+#
+#   --enable-cpu-profiling \  Requires CPU support.
 #
 #
-OPTS=" \
+# NP: DISTCHECK_CONFIGURE_FLAGS is a magic automake macro for the 
+#     distcheck target recursive tests beteen scripted runs.
+#     we use it to perform the same duty between our nested scripts.
+DISTCHECK_CONFIGURE_FLAGS=" \
        --enable-loadable-modules \
        --enable-gnuregex \
        --enable-optimizations \
@@ -62,34 +73,27 @@ OPTS=" \
        --enable-cachemgr-hostname \
        --enable-eui \
        --enable-htcp \
-       --enable-ssl \
        --enable-forw-via-db \
        --enable-cache-digests \
        --enable-poll \
        --enable-select \
        --enable-http-violations \
        --enable-ipfw-transparent \
-       --enable-ipf-transparent \
-       --enable-pf-transparent \
-       --enable-linux-netfilter \
-       --enable-linux-tproxy \
        --enable-leakfinder \
        --enable-follow-x-forwarded-for \
        --enable-ident-lookups \
-       --enable-internal-dns \
        --enable-default-hostsfile \
        --enable-auth \
-       --enable-basic-auth-helpers=all \
-       --enable-ntlm-auth-helpers=all \
-       --enable-negotiate-auth-helpers=all \
-       --enable-digest-auth-helpers=all \
+       --enable-basic-auth-helpers \
+       --enable-ntlm-auth-helpers \
+       --enable-negotiate-auth-helpers \
+       --enable-digest-auth-helpers \
        --enable-ntlm-fail-open \
-       --enable-external-acl-helpers=all \
-       --enable-url-rewrite-helpers=all \
+       --enable-external-acl-helpers \
+       --enable-url-rewrite-helpers \
        --enable-mempools \
        --enable-unlinkd \
        --enable-stacktraces \
-       --enable-cpu-profiling \
        --enable-vary \
        --enable-x-accelerator-vary \
        --enable-ipv6 \
@@ -97,7 +101,6 @@ OPTS=" \
        --enable-translation \
        --enable-zph-qos \
        --enable-esi \
- \
        --with-aio \
        --with-build-environment=default \
        --with-dl \
@@ -107,8 +110,10 @@ OPTS=" \
        --with-large-files \
        --with-pic \
        --with-pthreads \
-       --with-valgrind-debug \
+       --enable-build-info=squid\ test\ build \
+       --enable-ssl-crtd \
+       --with-openssl \
        "
 
 # Fix the distclean testing.
-export DISTCHECK_CONFIGURE_FLAGS="${OPTS}"
+export DISTCHECK_CONFIGURE_FLAGS