From 5a6638fed0ddfe149a113b029bda0e789a74d204 Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 25 Sep 2007 11:47:45 +0000
Subject: [PATCH] test fixup.

git-svn-id: file:///svn/unbound/trunk@639 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 doc/plan              |  2 ++
 testcode/mini_tpkg.sh | 13 +++++++------
 testcode/testbed.sh   |  5 ++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/doc/plan b/doc/plan
index 709b70236..21f0119d5 100644
--- a/doc/plan
+++ b/doc/plan
@@ -181,6 +181,8 @@ Styleguide:
 	or 1/number of seconds it takes start up of 10k.
 * should the source include a copy of the ldns lib for ease of building by 
   new users.
+* no greedy TTL algo (and test). 
+* maximum TTL, cap incoming values, and config option.
 
 *** Local zones feature.
 * Build in local zone features. First the total stop for1912.
diff --git a/testcode/mini_tpkg.sh b/testcode/mini_tpkg.sh
index 283581ff9..5b376432c 100755
--- a/testcode/mini_tpkg.sh
+++ b/testcode/mini_tpkg.sh
@@ -43,12 +43,13 @@ fi
 shift
 
 # do not execute if the disk is too full
-DISKLIMIT=100000
-avail=`df . | tail -1 | awk '{print $4}'`
-if test "$avail" -lt "$DISKLIMIT"; then
-	echo "minitpkg: The disk is too full! Only $avail."
-	exit 1
-fi
+#DISKLIMIT=100000
+# This check is not portable (to Solaris 10).
+#avail=`df . | tail -1 | awk '{print $4}'`
+#if test "$avail" -lt "$DISKLIMIT"; then
+	#echo "minitpkg: The disk is too full! Only $avail."
+	#exit 1
+#fi
 
 name=`basename $1 .tpkg`
 dir=$name.$$
diff --git a/testcode/testbed.sh b/testcode/testbed.sh
index f33896443..713c7cfad 100755
--- a/testcode/testbed.sh
+++ b/testcode/testbed.sh
@@ -77,12 +77,11 @@ EOF
 		# echossh $1 "gtar xzf unbound_ttt.tar.gz && rm unbound_ttt.tar.gz"
 	fi
 	echossh $1 "cd $2; $MAKE_CMD -f makeconf.mak.$$ Makefile"
-	echossh $1 "cd $2; $MAKE_CMD"
+	echossh $1 "cd $2; $MAKE_CMD all tests"
 	echossh $1 "cd $2; $MAKE_CMD doc"
 	if test $RUN_TEST = yes; then
-	echossh $1 "cd $2/testdata; tpkg clean"
 	echossh $1 "cd $2; bash testcode/do-tests.sh"
-	echossh $1 "cd $2/testdata; tpkg -q report" | tee -a $REPORT_FILE
+	echossh $1 "cd $2/testdata; sh ../testcode/mini_tpkg.sh -q report" | tee -a $REPORT_FILE
 	fi
 	echossh $1 "cd $2; rm -f makeconf.mak.$$"
 	rm -f makeconf.mak.$$
-- 
2.47.2