Changeset 52 for trunk/test

Timestamp:

Jul 24, 2006, 11:01:29 PM (18 years ago)

Author:

rainer

Message:

Fix stealth mode (regression in parser), add test for regression test suite

File:

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

trunk/test/testrun_1b.sh

@@ -20 +20 @@
 #
 
-MAXTEST=2; export MAXTEST
+MAXTEST=3; export MAXTEST
 LOGFILE="$PW_DIR/.samhain_log"; export LOGFILE
 RCFILE="$PW_DIR/testrc_1.dyn";  export RCFILE
@@ -70 +70 @@
             [ -z "$quiet" ]   && log_msg_fail  "extract gpg signed files...";
             return 1
+        fi
+
+        if test "x$2" = "x"; then
+            :
+        else
+            CONVERT="$2"
+            if test -f "${TOP_SRCDIR}/stealth_template.jpg"; then
+                [ -z "$verbose" ] || log_msg_ok "convert..."
+                "${CONVERT}" +compress "${TOP_SRCDIR}/stealth_template.jpg" stealth_template.ps >/dev/null
+            else
+                [ -z "$quiet" ]   && log_msg_fail  "cannot find file stealth_template.jpg"
+                return 1
+            fi
+            if [ $? -ne 0 ]; then
+                [ -z "$quiet" ]   && log_msg_fail  "${CONVERT} +compress ${TOP_SRCDIR}/stealth_template.jpg stealth_template.ps";
+                return 1
+            fi
+
+            [ -z "$verbose" ] || log_msg_ok "hide..."
+            ./samhain_stealth -s stealth_template.ps "$RCFILE" >/dev/null
+            if [ $? -ne 0 ]; then
+                [ -z "$quiet" ]   && log_msg_fail  "${CONVERT} +compress ${TOP_SRCDIR}/stealth_template.jpg stealth_template.ps";
+                return 1
+            fi
+
+            mv -f stealth_template.ps "$RCFILE"
+            if [ $? -ne 0 ]; then
+                [ -z "$quiet" ]   && log_msg_fail  "mv -f stealth_template.ps $RCFILE";
+                return 1
+            fi
+
         fi
 
@@ -171 +202 @@
             log_skip 2 $MAXTEST 'public PGP key 0x0F571F6C not present'
         else
+            #
+            # -------------  first test -------------
+            #
             BUILDOPTS="--quiet $TRUST --enable-debug --with-gpg=${GPG} --with-checksum=no --enable-micro-stealth=137 --enable-login-watch --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_internal "${BUILDOPTS}"
+            testrun1b_internal "${BUILDOPTS}" 
             do_test_1b
             if [ $? -eq 0 ]; then
@@ -179 +213 @@
                 log_fail 1 $MAXTEST 'gpg signed config/database files'
             fi
+
+
+            #
+            # -------------  second test -------------
+            #
+            PRECONV=`find_path convert`
+            "${PRECONV}" --help | grep  ImageMagick >/dev/null 2>&1 && \
+                CONVERT="${PRECONV}"
+
+            if [ -z "$CONVERT" ]; then
+                log_skip 2 $MAXTEST 'ImageMagick convert not found in $PATH'
+            else
+                BUILDOPTS="--quiet $TRUST --enable-debug --with-gpg=${GPG} --with-checksum=no --enable-stealth=137 --enable-login-watch --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_internal "${BUILDOPTS}" "$CONVERT"
+                do_test_1b
+                if [ $? -eq 0 ]; then
+                    log_ok   2 $MAXTEST 'gpg signed config/database files'
+                else
+                    log_fail 2 $MAXTEST 'gpg signed config/database files'
+                fi
+            fi
+
+
+            #
+            # -------------  third test -------------
+            #
             PM=`find_path prelude-manager`
             if [ -z "$PM" ]; then
-                log_skip 2 $MAXTEST 'prelude-manager not found in $PATH'
+                log_skip 3 $MAXTEST 'prelude-manager not found in $PATH'
             elif [ -z "$doall" ]; then
-                log_skip 2 $MAXTEST 'logging to prelude (or use --really-all)'
+                log_skip 3 $MAXTEST 'logging to prelude (or use --really-all)'
             else
                 BUILDOPTS="--quiet $TRUST --enable-debug --with-prelude --with-gpg=${GPG} --with-checksum=no --enable-micro-stealth=137 --enable-login-watch --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"
@@ -189 +249 @@
                 do_test_1b_2
                 if [ $? -eq 0 ]; then
-                    log_ok   2 $MAXTEST 'logging to prelude'
+                    log_ok   3 $MAXTEST 'logging to prelude'
                 else
-                    log_fail 2 $MAXTEST 'logging to prelude'
+                    log_fail 3 $MAXTEST 'logging to prelude'
                 fi
             fi