From f82bfc214be8613f9a5a37ae1b7decd6b476924f Mon Sep 17 00:00:00 2001
From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 18 Jul 2009 00:53:46 +1200
Subject: [PATCH] TestBed: Truely make distcheck work for all configure levels

Thanks to Alex Rousskov for identifying the necessary environment setting.
---
 test-suite/buildtests/layer-00-default.opts | 5 ++++-
 test-suite/buildtests/layer-01-minimal.opts | 5 ++++-
 test-suite/buildtests/layer-02-maximus.opts | 9 +++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/test-suite/buildtests/layer-00-default.opts b/test-suite/buildtests/layer-00-default.opts
index 74779fcfc7..fa83cf001a 100644
--- 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 10756db62b..07ab7b0b1c 100644
--- 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 ba8a9b580f..e85113e0bd 100644
--- 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}"
+
+
-- 
2.47.3