Changes in trunk/test/testrun_2a.sh [30:19]

File:

• trunk/test/testrun_2a.sh (modified) (12 diffs)

trunk/test/testrun_2a.sh

@@ -1 +1 @@
 #! /bin/sh
-
-#
-# Copyright Rainer Wichmann (2006)
-#
-# License Information:
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
 
 LOGFILE="$PW_DIR/.samhain_log"; export LOGFILE
@@ -25 +6 @@
 SERVER_BUILDOPTS="--quiet  $TRUST  --enable-network=server --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$PW_DIR/testrc_2 --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-logserver=${SH_LOCALHOST}  --with-log-file=$PW_DIR/.samhain_log --with-pid-file=$PW_DIR/.samhain_lock"; export SERVER_BUILDOPTS
 
-CLIENT_BUILDOPTS="--quiet  $TRUST --enable-debug --enable-network=client --enable-srp --prefix=$PW_DIR --with-tmp-dir=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$RCFILE --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-logserver=localhost  --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock"; export CLIENT_BUILDOPTS
+CLIENT_BUILDOPTS="--quiet  $TRUST --enable-debug --enable-network=client --enable-srp --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$RCFILE --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-logserver=localhost  --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock"; export CLIENT_BUILDOPTS
 
 do_test_1_a () {
@@ -34 +15 @@
             echo; 
         }
-        rm -f test_log_valgrind
-
-        ${VALGRIND} ./yule -l info -p none >/dev/null 2>>test_log_valgrind &
+        ./yule -l info -p none >/dev/null 2>&1 &
         PROC_Y=$!
         sleep 5
@@ -46 +25 @@
         }
 
-        ${VALGRIND} ./samhain.new -t check -p none -l none -e info --bind-address=127.0.0.1 >/dev/null 2>>test_log_valgrind
+        ./samhain.new -t check -p none -l none -e info --bind-address=127.0.0.1 >/dev/null 2>&1
         if test x$? = x0; then
             [ -z "$verbose" ] || log_msg_ok    "samhain.new -t check";
@@ -84 +63 @@
         fi
         
-        [ -z "$VALGRIND" ] || {
-            tmp=`cat test_log_valgrind 2>/dev/null | wc -l`;
-            if [ $tmp -ne 0 ]; then
-                [ -z "$verbose" ] || log_msg_fail "valgrind reports errors";
-                cat test_log_valgrind
-                return 1;
-            fi;
-        }
 
         return 0
@@ -131 +102 @@
         #
         cp samhain samhain.build || return 1
-        $MAKE clean >/dev/null || return 1
+        make clean >/dev/null || return 1
 
         ${TOP_SRCDIR}/configure ${SERVER_BUILDOPTS}
@@ -159 +130 @@
         rm -f ./rc.${SH_LOCALHOST}
         rm -f ./file.${SH_LOCALHOST}
-        rm -f  "./rc.${ALTHOST}"
-        rm -f  "./file.${ALTHOST}"
 
         cp ${SCRIPTDIR}/testrc_2.in testrc_2
@@ -197 +166 @@
         rm -f ./.samhain_lock
 
-        SHCLT=`./yule -P $SHPW`
+        SHCLT=`./yule -P $SHPW | sed s%HOSTNAME%${SH_LOCALHOST}%`
 
         if test x$? = x0; then
@@ -206 +175 @@
         fi
 
-        SHCLT1=`echo "${SHCLT}"  | sed s%HOSTNAME%${SH_LOCALHOST}%`
-        AHOST=`find_hostname`
-        SHCLT2=`echo "${SHCLT}"  | sed s%HOSTNAME%${AHOST}%`
-        
-
-        echo $SHCLT1 >> testrc_2
-        echo $SHCLT2 >> testrc_2
-
+        echo $SHCLT >> testrc_2
 
         cp    ./testrc_2       ./rc.${SH_LOCALHOST}
@@ -224 +186 @@
 }
 
-MAXTEST=5; export MAXTEST
+MAXTEST=1; export MAXTEST
 
 testrun2a ()
@@ -237 +199 @@
     #
     testrun2a_internal
+    #
     do_test_1_a
     if [ $? -eq 0 ]; then
@@ -242 +205 @@
     else
         [ -z "$quiet" ] && log_fail 1 ${MAXTEST} "Client download+logging";
-    fi
-    #
-    SERVER_BUILDOPTS_ORIG="${SERVER_BUILDOPTS}"
-    CLIENT_BUILDOPTS_ORIG="${CLIENT_BUILDOPTS}"
-    #
-    SERVER_BUILDOPTS="${SERVER_BUILDOPTS_ORIG} --disable-srp"
-    CLIENT_BUILDOPTS="${CLIENT_BUILDOPTS_ORIG} --disable-srp"
-    #
-    testrun2a_internal
-    do_test_1_a
-    if [ $? -eq 0 ]; then
-        [ -z "$quiet" ] && log_ok   2 ${MAXTEST} "SRP disabled";
-    else
-        [ -z "$quiet" ] && log_fail 2 ${MAXTEST} "SRP disabled";
-    fi
-    #
-    SERVER_BUILDOPTS="${SERVER_BUILDOPTS_ORIG} --disable-encrypt"
-    CLIENT_BUILDOPTS="${CLIENT_BUILDOPTS_ORIG} --disable-encrypt"
-    #
-    testrun2a_internal
-    do_test_1_a
-    if [ $? -eq 0 ]; then
-        [ -z "$quiet" ] && log_ok   3 ${MAXTEST} "Encryption disabled";
-    else
-        [ -z "$quiet" ] && log_fail 3 ${MAXTEST} "Encryption disabled";
-    fi
-    #
-    SERVER_BUILDOPTS="${SERVER_BUILDOPTS_ORIG} --enable-encrypt=1"
-    CLIENT_BUILDOPTS="${CLIENT_BUILDOPTS_ORIG} --enable-encrypt=1"
-    #
-    testrun2a_internal
-    do_test_1_a
-    if [ $? -eq 0 ]; then
-        [ -z "$quiet" ] && log_ok   4 ${MAXTEST} "Encryption (v1)";
-    else
-        [ -z "$quiet" ] && log_fail 4 ${MAXTEST} "Encryption (v1)";
-    fi
-    #
-    SERVER_BUILDOPTS="${SERVER_BUILDOPTS_ORIG}"
-    CLIENT_BUILDOPTS="${CLIENT_BUILDOPTS_ORIG} --enable-encrypt=1"
-    #
-    testrun2a_internal
-    do_test_1_a
-    if [ $? -eq 0 ]; then
-        [ -z "$quiet" ] && log_ok   5 ${MAXTEST} "Encryption backward compat";
-    else
-        [ -z "$quiet" ] && log_fail 5 ${MAXTEST} "Encryption backward compat";
     fi
     #