Changeset 169 for trunk/test/testrun_1b.sh

Timestamp:

Apr 13, 2008, 9:59:55 PM (16 years ago)

Author:

katerina

Message:

Fixes for tickes #93 to #104 (yes, big commit, bad, bad,...).

File:

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

trunk/test/testrun_1b.sh

@@ -20 +20 @@
 #
 
-MAXTEST=5; export MAXTEST
+MAXTEST=6; export MAXTEST
 LOGFILE="$PW_DIR/.samhain_log"; export LOGFILE
 RCFILE="$PW_DIR/testrc_1.dyn";  export RCFILE
@@ -136 +136 @@
 
         mv $PW_DIR/.samhain_file.asc $PW_DIR/.samhain_file
+}
+
+testrun1b_nogpg ()
+{
+        BUILDOPTS="$1"
+        #
+        # test standalone compilation
+        #
+        [ -z "$verbose" ] || { echo; echo "${S}Building standalone agent${E}"; echo; }
+        #
+        if test -r "Makefile"; then
+                $MAKE distclean >/dev/null >&1
+        fi
+
+        ${TOP_SRCDIR}/configure ${BUILDOPTS} 2>/dev/null 
+        #
+        #
+        if test x$? = x0; then
+                [ -z "$verbose" ] ||     log_msg_ok "configure..."; 
+                $MAKE  > /dev/null 2>&1
+                if test x$? = x0; then
+                    [ -z "$verbose" ] || log_msg_ok "make..."; 
+                else
+                    [ -z "$quiet" ] &&   log_msg_fail "make..."; 
+                    return 1
+                fi
+
+        else
+                [ -z "$quiet" ] &&       log_msg_fail "configure...";
+                return 1
+        fi
+
+        rm -f ./.samhain_file
+        rm -f ./.samhain_log
+        rm -f ./.samhain_lock
+
+        cp "${SCRIPTDIR}/testrc_1" "${RCFILE}"
+
+        ./samhain -t init -p none -l info
+
+        if test x$? = x0; then
+            [ -z "$verbose" ] || log_msg_ok    "init...";
+        else
+            [ -z "$quiet" ]   && log_msg_fail  "init...";
+            return 1
+        fi
+
 }
 
@@ -316 +363 @@
                 fi
             fi
+
+            #
+            # -------------  sixth test -------------
+            #
+            if test -f /usr/local/lib/libprelude.so
+            then
+                    LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH"
+                    export LD_LIBRARY_PATH
+            fi
+            #
+            PM=`find_path prelude-manager`
+            if [ -z "$PM" ]; then
+                log_skip 6 $MAXTEST 'prelude-manager not found in $PATH'
+            elif [ -z "$doall" ]; then
+                log_skip 6 $MAXTEST 'logging to prelude (or use --really-all)'
+            else
+                BUILDOPTS="--quiet $TRUST --with-prelude --enable-login-watch --enable-mounts-check --enable-process-check --enable-port-check --enable-suidcheck --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$RCFILE  --with-log-file=$PW_DIR/.samhain_log --with-pid-file=$PW_DIR/.samhain_lock --with-data-file=$PW_DIR/.samhain_file"
+                testrun1b_nogpg "${BUILDOPTS} CFLAGS=-DSH_NOFAILOVER=1"
+                do_test_1b_2
+                if [ $? -eq 0 ]; then
+                    log_ok   6 $MAXTEST 'logging to prelude'
+                else
+                    log_fail 6 $MAXTEST 'logging to prelude'
+                fi
+            fi
+
         fi
     fi