Changeset 159 for trunk/test/testrun_1b.sh

Timestamp:

Jan 16, 2008, 11:12:13 PM (17 years ago)

Author:

katerina

Message:

Fix for ticket #87 (option --with-checksum broken).

File:

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

trunk/test/testrun_1b.sh

@@ -36 +36 @@
         fi
         #
-        #
-        ${TOP_SRCDIR}/configure ${BUILDOPTS} >/dev/null 2>/dev/null
+        # Bootstrapping
+        #
+        ${TOP_SRCDIR}/configure >/dev/null 2>/dev/null
+        if test x$? = x0; then
+                [ -z "$verbose" ] ||     log_msg_ok "configure (bootstrap)..."; 
+                $MAKE  > /dev/null 2>&1
+                if test x$? = x0; then
+                    [ -z "$verbose" ] || log_msg_ok "make (bootstrap)..."; 
+                else
+                    [ -z "$quiet" ] &&   log_msg_fail "make (bootstrap)..."; 
+                    return 1
+                fi
+
+        else
+                [ -z "$quiet" ] &&       log_msg_fail "configure (bootstrap)...";
+                return 1
+        fi
+        #
+        #
+        ${TOP_SRCDIR}/configure ${BUILDOPTS} 2>/dev/null | \
+            egrep 'use existing [./[:alnum:]]+ for gpg checksum' >/dev/null
         #
         #
@@ -59 +78 @@
         tail -n "+$SKIP" ${SCRIPTDIR}/test.sh >/dev/null 2>&1
         if [ $? -eq 0 ]; then
-            tail -n "+$SKIP" ${SCRIPTDIR}/test.sh | gunzip -c - | tar xf - &&  \
+            tail -n "+$SKIP" ${SCRIPTDIR}/test.sh | gunzip -c - 2>/dev/null | tar xf - &&  \
                 mv "./testrc.gpg.asc" "$RCFILE"
         else
-            tail "+$SKIP" ${SCRIPTDIR}/test.sh | gunzip -c - | tar xf - &&  \
+            tail "+$SKIP" ${SCRIPTDIR}/test.sh | gunzip -c - 2>/dev/null | tar xf - &&  \
                 mv "./testrc.gpg.asc" "$RCFILE"
         fi
@@ -214 +233 @@
             # -------------  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"
+            BUILDOPTS="--quiet $TRUST --enable-debug --with-gpg=${GPG} --with-checksum --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}" 
             do_test_1b
@@ -234 +253 @@
                 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"
+                BUILDOPTS="--quiet $TRUST --enable-debug --with-gpg=${GPG} --with-checksum --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
@@ -260 +279 @@
                 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"
+                BUILDOPTS="--quiet $TRUST --enable-debug --with-prelude --with-gpg=${GPG} --with-checksum --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} CFLAGS=-DSH_NOFAILOVER=1"
                 do_test_1b_2