Correct TestBed make checks.

distcheck drops any custom configure options. We can't use it
outside the 00-default test.

We can keep check, and should add any others that may be useful if
they can be identified and shown not to re-run configure.

Also move some old distclean hacks that may be obsolete now out of
the way to a rare occurance when thay might still be relevant.

diff --git a/test-suite/buildtest.sh b/test-suite/buildtest.sh
index 7d1875616b4a287251a570660e4b0fa9aa294271..caaf0fa71337298d46efa656d72aa1a28490ecbc 100755 (executable)
--- a/test-suite/buildtest.sh
+++ b/test-suite/buildtest.sh
@@ -31,14 +31,14 @@ fi
 FILECOUNT=`ls -1 | grep -c .`
 if test "${FILECOUNT}" != "0" ; then
   make -k distclean || echo "distclean done. errors are unwanted but okay here."
+  rm -f -r src/fs/aufs/.deps src/fs/diskd/.deps
 fi
 
 #
 # above command currently encounters dependancy problems on cleanup.
 #
 # do not build any of the install's ...
-rm -f -r src/fs/aufs/.deps src/fs/diskd/.deps &&
-       $base/../configure --silent ${OPTS} 2>&1 &&
+       $base/../configure ${OPTS} 2>&1 &&
        make ${pjobs} ${MAKETEST} 2>&1
 
 # Remember and then explicitly return the result of the last command

diff --git a/test-suite/buildtests/layer-01-minimal.opts b/test-suite/buildtests/layer-01-minimal.opts
index 353cd7aa455eaa6f7a28b32c81f289a85798c545..10756db62b7bca97e5cf8531861b2e3491853dfd 100644 (file)
--- a/test-suite/buildtests/layer-01-minimal.opts
+++ b/test-suite/buildtests/layer-01-minimal.opts
@@ -4,8 +4,9 @@
 # - Everyhing that can be done without is 
 #
 #
-# Complete Check - everything MUST work at this level
-MAKETEST="distcheck"
+# Check - everything MUST work at this level
+# distcheck is not possible here since it drops our configure options...
+MAKETEST="check"
 #
 #
 # The options for this level can be easily generated semi-automatically from configure.in by:

diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts
index 70e116a9213f92cb606b5ef3f0944aad07e1b8a0..ba8a9b580f279722b524eef1d01452e5131e43e6 100644 (file)
--- a/test-suite/buildtests/layer-02-maximus.opts
+++ b/test-suite/buildtests/layer-02-maximus.opts
@@ -5,7 +5,8 @@
 #
 #
 # Complete Check - everything is supposed to work at this level
-MAKETEST="distcheck"
+# distcheck is not possible since it drops our configure options...
+MAKETEST="check"
 #
 #
 # The options for this level can be easily generated semi-automatically from configure.in by: