Changeset 19 for trunk/test/testhash.sh

Timestamp:

Feb 12, 2006, 10:49:56 PM (19 years ago)

Author:

rainer

Message:

Rewrite of test suite, checksum for growing logs, fix for minor bug with dead client detection.

File:

• trunk/test/testhash.sh (modified) (3 diffs)

trunk/test/testhash.sh

@@ -1 +1 @@
 #! /bin/sh
 
+RCFILE="$PW_DIR/testrc_1.dyn";  export RCFILE
+LOGFILE="$PW_DIR/.samhain_log"; export LOGFILE
 
-# The following two are the ANSI sequences for start and end embolden
-case $TERM in
-vt*|ansi*|con*|xterm*|linux*|screen*)
-  S=[1m
-  E=[m
-  ;;
-*)
-  S=
-  E=
-  ;;
-esac
-
-PW_DIR=`pwd`
-
-if test x$UID != x; then
-  TRUST="--with-trusted=0,2,$UID"
-else
-  TRUST="--with-trusted=0,2"
-fi
-
-#echo; echo "${S}__ STARTING TEST HASH FUNCTION __${E}"; echo;
-#echo Working directory: $PW_DIR
-
-MAKE=`which gmake`
-if test "x$?" = x1 ; then
-    MAKE="make -s"
-else
-    MAKE=`which gmake | sed -e "s%\([a-z:]\) .*%\1%g"` 
-    if test "x$MAKE" = x; then
-        MAKE="make -s"
-    elif test "x$MAKE" = xno; then
-        MAKE="make -s"
-    else
-        if test "x$MAKE" = "xwhich:"; then
-                MAKE="make -s"
-        else
-                MAKE="gmake -s"
-                gmake -v >/dev/null 2>&1 || MAKE="make -s"
-        fi
-    fi
-fi
-
-
+MAXTEST=1; export MAXTEST
 
 testhash ()
 {
+        log_start "HASH FUNCTION"
         #
         # test standalone compilation
@@ -57 +18 @@
         fi
         #
-        ${TOP_SRCDIR}/configure --quiet  --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test  > /dev/null 2>> test_log  
+        ${TOP_SRCDIR}/configure --quiet $TRUST --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$RCFILE --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --with-data-file=$PW_DIR/.samhain_file --enable-debug
+        #
+        fail=0
         #
         if test x$? = x0; then
-                echo "PASS: configure ${TEST}"; 
+                [ -z "$verbose" ] || log_msg_ok  "configure...";
                 $MAKE  > /dev/null 2>> test_log
                 if test x$? = x0; then
-                    echo "PASS: $MAKE  ${TEST}";
+                    [ -z "$verbose" ] || log_msg_ok "make...";
                 else
-                    echo "FAIL: $MAKE  ${TEST} (see ./test_log)";
+                    [ -z "$quiet" ] &&   log_msg_fail "make...";
+                    fail=1
                 fi
         else
-                echo "FAIL: configure  ${TEST} (see ./test_log)"; 
+                [ -z "$quiet" ] && log_msg_fail "configure...";
+                fail=1
         fi
-
+        #
+        if [ $fail -eq 1 ]; then
+            [ -z "$quiet" ] && log_fail 1 ${MAXTEST};
+            return 1
+        fi
+        #
         echo "Test results of the TIGER hash algorithm" > testhash.tmp
         echo >> testhash.tmp
@@ -84 +54 @@
         ./samhain -H "Tiger - A Fast New Hash Function, by Ross Anderson and Eli Biham, proceedings of Fast Software Encryption 3, Cambridge, 1996." >> testhash.tmp
         ./samhain -H "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-" >> testhash.tmp
-
-        # echo
-        # echo "${S}diff testhash.tmp testtiger.txt (empty == success):${E}" 
-        # echo
-        RESU=`diff testhash.tmp ${SCRIPTDIR}/testtiger.txt`
+        #
+        RESU=`diff testhash.tmp ${SCRIPTDIR}/testtiger.txt 2>/dev/null`
         if test "x${RESU}" = "x"; then
-            echo "PASS: test_hash"
+            [ -z "$quiet" ] && log_ok   1 ${MAXTEST};
         else
-            echo "FAIL: test_hash"
+            [ -z "$quiet" ] && log_fail 1 ${MAXTEST};
+            return 1
         fi
+        log_end "HASH FUNCTION"
+        return 0
 }
 
 
 
-        testhash
-
-
-#echo; echo "${S}__ END TEST HASH FUNCTION __${E}"; echo;
-
-exit
-