Use DISTCHECK_CONFIGURE_FLAGS to make recursive distcheck work again.

DISTCHECK_CONFIGURE_FLAGS is a magic automake macro for the
distcheck target recursive tests between scripted runs.
we use it to perform the same duty between our nested scripts.

We used it earlier but lost it through a bit of forgetfulness. Documented
now to prevent that happening again.

diff --git a/test-suite/buildtests/layer-00-default.opts b/test-suite/buildtests/layer-00-default.opts
index 50057fcbdff508444f78b3b59de24421253877f4..29afd67752885790b3dd3ae49f30ce150362db40 100644 (file)
--- a/test-suite/buildtests/layer-00-default.opts
+++ b/test-suite/buildtests/layer-00-default.opts
@@ -6,7 +6,11 @@ MAKETEST="distcheck"
 # Default configuration options.
 #  - Nothing special configured. Just whatever is found by "./configure"
 #
-SQUID_CONFIGURE_FLAGS=""
+# 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=""
 
 # Fix the distclean testing.
-export SQUID_CONFIGURE_FLAGS
+export DISTCHECK_CONFIGURE_FLAGS
+

diff --git a/test-suite/buildtests/layer-01-minimal.opts b/test-suite/buildtests/layer-01-minimal.opts
index 047f3b149378dc5d310d10459597eb170c30c47e..46c1ab4ea627993088490970cdb78084c88c180f 100644 (file)
--- a/test-suite/buildtests/layer-01-minimal.opts
+++ b/test-suite/buildtests/layer-01-minimal.opts
@@ -26,7 +26,10 @@ MAKETEST="distcheck"
 #   --without-build-environment \
 #
 #
-SQUID_CONFIGURE_FLAGS=" \
+# 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=" \
        --disable-build-info \
        --disable-loadable-modules \
        --disable-gnuregex \
@@ -100,4 +103,4 @@ SQUID_CONFIGURE_FLAGS=" \
        "
 
 # Fix the distclean testing.
-export SQUID_CONFIGURE_FLAGS
+export DISTCHECK_CONFIGURE_FLAGS

diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts
index 27637f4304489c9f46b9d6abe126f6507948adf4..675b53a4539c5250c3f445d950914ab85c19c0da 100644 (file)
--- a/test-suite/buildtests/layer-02-maximus.opts
+++ b/test-suite/buildtests/layer-02-maximus.opts
@@ -40,7 +40,10 @@ MAKETEST="distcheck"
 #   --with-valgrind-debug \
 #
 #
-SQUID_CONFIGURE_FLAGS=" \
+# 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 \
@@ -107,4 +110,4 @@ SQUID_CONFIGURE_FLAGS=" \
        "
 
 # Fix the distclean testing.
-export SQUID_CONFIGURE_FLAGS
+export DISTCHECK_CONFIGURE_FLAGS

diff --git a/test-suite/buildtests/layer-05-nodeps-esi.opts b/test-suite/buildtests/layer-05-nodeps-esi.opts
index 578cf6862970e6a86a86c8b0cb5b5816155dd90f..d90a81efea95ec738f47c621d974b6cfa3f72d6c 100644 (file)
--- a/test-suite/buildtests/layer-05-nodeps-esi.opts
+++ b/test-suite/buildtests/layer-05-nodeps-esi.opts
@@ -10,11 +10,14 @@ MAKETEST="distcheck"
 # NP: there must be no overlap in code for plugging the libraries in/out.
 #     this means we can test the absence of all in one run and save time.
 #
-SQUID_CONFIGURE_FLAGS="\
+# 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-esi \
        --without-expat \
        --without-libxml2 \
        --enable-build-info"
 
 # Fix the distclean testing.
-export SQUID_CONFIGURE_FLAGS
+export DISTCHECK_CONFIGURE_FLAGS

diff --git a/test-suite/buildtests/os-debian.opts b/test-suite/buildtests/os-debian.opts
index dbf46c337d722d59e05ed71f652ef45f1a4661fa..92d7b1fdf143b04bcb9c2301554a3f17c428904b 100644 (file)
--- a/test-suite/buildtests/os-debian.opts
+++ b/test-suite/buildtests/os-debian.opts
@@ -5,9 +5,12 @@ MAKETEST="check installcheck uninstallcheck"
 #
 # Configure options currently used by Debian Packaged Release
 #
-# This is to test any release build against what the package maintainers are seing
+# This is to test any release build against what the package maintainers are seeing
 #
-SQUID_CONFIGURE_FLAGS=" \
+# 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=" \
        --build=i486-linux-gnu \
        --prefix=/usr \
        --includedir="\${prefix}/include" \

diff --git a/test-suite/buildtests/os-mingw.opts b/test-suite/buildtests/os-mingw.opts
index a125d4ae57586721e0b6d7b2682e8d283b7fd98f..53417cd9348aa0308338e7a8223034f56dd106b2 100644 (file)
--- a/test-suite/buildtests/os-mingw.opts
+++ b/test-suite/buildtests/os-mingw.opts
@@ -5,7 +5,10 @@ MAKETEST="check installcheck uninstallcheck"
 #
 # Configure options currently supported by MinGW environment
 #
-SQUID_CONFIGURE_FLAGS=" \
+# 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=" \
        --prefix=c:/squid \
        --enable-storeio="ufs,aufs" \
        --enable-removal-policies="lru,heap" \

diff --git a/test-suite/buildtests/os-ubuntu.opts b/test-suite/buildtests/os-ubuntu.opts
index 0c9db9ddbf0948d9902bfac66ebb59fe3784be86..872e76e609c113213f0eae4da1bc6e85f071ec1b 100644 (file)
--- a/test-suite/buildtests/os-ubuntu.opts
+++ b/test-suite/buildtests/os-ubuntu.opts
@@ -6,7 +6,10 @@ MAKETEST="check installcheck uninstallcheck"
 #
 # This is to test any release build against what the package maintainers are seeing
 #
-SQUID_CONFIGURE_FLAGS=" \
+# 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=" \
        --build=i486-linux-gnu \
        --prefix=/usr \
        --includedir="\${prefix}/include" \