libevent option for testbed.

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

diff --git a/doc/Changelog b/doc/Changelog
index 33a892ce4c4cae5fe5a2932a8944b45b37a5e470..f0d4b9811bf28d23e679846c049fb4f98f76349f 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -5,6 +5,7 @@
          it checks the logfiles to see if servers have come up. Takes 0.14s.
        - set addrlen value when calling recvfrom.
        - comparison of addrs more portable.
+       - LIBEVENT option for testbed to set libevent directory.
 
 6 February 2007: Wouter
        - reviewed code and improved in places.

diff --git a/testcode/testbed.sh b/testcode/testbed.sh
index d88656146fb2190bf9bd0694f2695cfa8320a92d..454a524e241182479299987da469ba197d43ee0d 100755 (executable)
--- a/testcode/testbed.sh
+++ b/testcode/testbed.sh
@@ -68,6 +68,9 @@ function dotest()
        if test x$LDNS != x; then
                DISABLE="--with-ldns=$LDNS $DISABLE"
        fi
+       if test x$LIBEVENT != x; then
+               DISABLE="--with-libevent=$LIBEVENT $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 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"
@@ -115,6 +118,7 @@ for((i=0; i<${#hostname[*]}; i=$i+1)); do
        FIXCONFIGURE=no
        RUN_TEST=yes
        LDNS=
+       LIBEVENT=
        eval ${vars[$i]}
        echo "*** ${hostname[$i]} ${desc[$i]} ***" | tee -a $LOG_FILE | tee -a $REPORT_FILE
        dotest ${hostname[$i]} ${dir[$i]} 2>&1 | tee -a $LOG_FILE

diff --git a/testcode/testbed.txt b/testcode/testbed.txt
index 52744b555bc9655f5458e15bfc3b77973d11cd2d..b0175049eec464215fbd3a8206746b4a7d4dfdc3 100644 (file)
--- a/testcode/testbed.txt
+++ b/testcode/testbed.txt
@@ -22,6 +22,9 @@ Only important variable for unbound is the LDNS=<dir> variable that if present
 forces --with-ldns=<dir> to be passed to ./configure. In case LDNS is not
 installed on the system itself, but present somewhere else.
 
+You can also set LIBEVENT=<dir> for the libevent directory, if it is
+installed in a nonstandard location.
+
 *** Running the testbed
 
 Run by executing the script. It will take all the hosts from the file in