testbed update.

git-svn-id: file:///svn/unbound/trunk@17 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index e2d506897092d9fc407ecd07760aa7e2a4d1ef80..077f8b1b6a8ddc017601b30ccc14127933f19b50 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 4 January 2007: Wouter
        - Testbed script (run on multiple platforms the test set).
+         Works on Sunos9, Sunos10, FreeBSD 6.1, Fedora core 5.
 
 3 January 2007: Wouter
        - committed first set of files into subversion repository.

diff --git a/testcode/testbed.sh b/testcode/testbed.sh
index f1cf761837e9f4a95c62f162fc8a21eb0356dfb6..d88656146fb2190bf9bd0694f2695cfa8320a92d 100755 (executable)
--- a/testcode/testbed.sh
+++ b/testcode/testbed.sh
@@ -12,6 +12,11 @@ REPORT_FILE=testdata/testbed.report
 LOG_FILE=testdata/testbed.log
 HOST_FILE=testdata/host_file.$USER
 
+if test ! -f $HOST_FILE; then
+       echo "No such file: $HOST_FILE"
+       exit 1
+fi
+
 function echossh() # like ssh but echos.
 {
        echo "> ssh $*"
@@ -64,7 +69,8 @@ function dotest()
                DISABLE="--with-ldns=$LDNS $DISABLE"
        fi
        echossh $1 "cd $2; if test ! -f config.h -o configure -nt config.h; then ./configure $CONFIGURE_FLAGS $DISABLE; fi"
-       echossh $1 "cd $2; if which gmake; then gmake; else $MAKE_CMD; fi"
+       echossh $1 "cd $2; if test -f "'"`which gmake`"'"; then gmake; else $MAKE_CMD; fi"
+       echossh $1 "cd $2; if test -f "'"`which gmake`"'"; then gmake doc; else $MAKE_CMD doc; fi"
        if test $RUN_TEST = yes; then
        echossh $1 "cd $2/testdata; tpkg clean"
        echossh $1 "cd $2; bash testcode/do-tests.sh"
@@ -102,7 +108,7 @@ for((i=0; i<${#hostname[*]}; i=$i+1)); do
        # echo "desc=[${desc[$i]}]"
        # echo "dir=[${dir[$i]}]"
        # echo "vars=[${vars[$i]}]"
-       AC_CMD="libtoolize -c; autoconf && autoheader"
+       AC_CMD="libtoolize -c --force; autoconf && autoheader"
        MAKE_CMD="make"
        SVN=yes
        IP6=yes
@@ -111,7 +117,7 @@ for((i=0; i<${#hostname[*]}; i=$i+1)); do
        LDNS=
        eval ${vars[$i]}
        echo "*** ${hostname[$i]} ${desc[$i]} ***" | tee -a $LOG_FILE | tee -a $REPORT_FILE
-       dotest ${hostname[$i]} ${dir[$i]} | tee -a $LOG_FILE
+       dotest ${hostname[$i]} ${dir[$i]} 2>&1 | tee -a $LOG_FILE
 done
 
 echo "done"