TestBed: Truely make distcheck work for all configure levels

Thanks to Alex Rousskov for identifying the necessary environment setting.

diff --git a/test-suite/buildtests/layer-00-default.opts b/test-suite/buildtests/layer-00-default.opts
index 74779fcfc795e705cbeaec57d5f222339fe54709..fa83cf001a428b78f930114b027d996b9af31db9 100644 (file)
--- a/test-suite/buildtests/layer-00-default.opts
+++ b/test-suite/buildtests/layer-00-default.opts
@@ -6,4 +6,7 @@ MAKETEST="distcheck"
 # Default configuration options.
 #  - Nothing special configured. Just whatever is found by "./configure"
 #
-OPTS=""
+OPTS="--disable-loadable-modules"
+
+# Fix the distclean testing.
+export DISTCHECK_CONFIGURE_FLAGS="${OPTS}"

diff --git a/test-suite/buildtests/layer-01-minimal.opts b/test-suite/buildtests/layer-01-minimal.opts
index 10756db62b7bca97e5cf8531861b2e3491853dfd..07ab7b0b1c95590aac6054331ff6a26770974111 100644 (file)
--- a/test-suite/buildtests/layer-01-minimal.opts
+++ b/test-suite/buildtests/layer-01-minimal.opts
@@ -6,7 +6,7 @@
 #
 # Check - everything MUST work at this level
 # distcheck is not possible here since it drops our configure options...
-MAKETEST="check"
+MAKETEST="distcheck"
 #
 #
 # The options for this level can be easily generated semi-automatically from configure.in by:
@@ -97,3 +97,6 @@ OPTS=" \
        --without-dns-cname \
        --without-po2html \
        "
+
+# Fix the distclean testing.
+export DISTCHECK_CONFIGURE_FLAGS="${OPTS}"

diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts
index ba8a9b580f279722b524eef1d01452e5131e43e6..e85113e0bd0750ec8a055a31f3e12dd4a8f81292 100644 (file)
--- a/test-suite/buildtests/layer-02-maximus.opts
+++ b/test-suite/buildtests/layer-02-maximus.opts
@@ -6,7 +6,7 @@
 #
 # Complete Check - everything is supposed to work at this level
 # distcheck is not possible since it drops our configure options...
-MAKETEST="check"
+MAKETEST="distcheck"
 #
 #
 # The options for this level can be easily generated semi-automatically from configure.in by:
@@ -41,7 +41,7 @@ MAKETEST="check"
 #
 #
 OPTS=" \
-       --enable-loadable-modules \
+       --disable-loadable-modules \
        --enable-gnuregex \
        --enable-optimizations \
        --enable-inline \
@@ -108,3 +108,8 @@ OPTS=" \
        --with-pthreads \
        --with-valgrind-debug \
        "
+
+# Fix the distclean testing.
+export DISTCHECK_CONFIGURE_FLAGS="${OPTS}"
+
+