Changeset 170 for trunk/test/testcompile.sh

Timestamp:

Apr 30, 2008, 11:56:45 PM (17 years ago)

Author:

katerina

Message:

Plenty of compiler warnings fixed, SQL query length fixed, doc update.

File:

• trunk/test/testcompile.sh (modified) (6 diffs)

trunk/test/testcompile.sh

@@ -41 +41 @@
     if [ -z "$doall" ]; then
         [ -z "$quiet" ] && log_skip $2 ${MAXTEST} "$TEST (smatch)";
+        return 0
+    fi
+
+    if [ ! -f "./x_samhain.c.sm" ]; then
+        [ -z "$quiet" ] && log_skip $2 ${MAXTEST} "$TEST (skip smatch)";
         return 0
     fi
@@ -140 +145 @@
             SAVE_CC="${CC}"
             SMATCH="DBGDEF=--smatch"; export SMATCH
+            SAVE_SMATCH="${SMATCH}"; export SAVE_SMATCH
             CC="/usr/local/gcc-smatch/bin/gcc"; export CC
+            SMATCH_CC="${CC}"
         fi
 
@@ -187 +194 @@
         fi
         #
+        [ -z "${SMATCH}" ] || { CC="${SAVE_CC}"; export CC; SMATCH=""; export SMATCH; }
+        #
         ${TOP_SRCDIR}/configure --quiet  --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test  --enable-static --enable-suidcheck --enable-process-check > /dev/null 2>> test_log
         #
@@ -193 +202 @@
         let "num = num + 1" >/dev/null
         run_smatch $? $num || let "numfail = numfail + 1"  >/dev/null
-
+        #
+        [ -z "${SMATCH_CC}" ] || { CC="${SMATCH_CC}"; export CC; SMATCH="${SAVE_SMATCH}"; export SMATCH; }
         #
         # test standalone compilation
@@ -481 +491 @@
         fi
         #
+        [ -z "${SMATCH}" ] || { CC="${SAVE_CC}"; export CC; SMATCH=""; export SMATCH; }
+        #
         ${TOP_SRCDIR}/configure --quiet --enable-network=client  --enable-static --enable-srp --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test   --with-timeserver=127.0.0.1 > /dev/null 2>> test_log   
         #
@@ -498 +510 @@
         let "num = num + 1" >/dev/null
         run_smatch $? $num || let "numfail = numfail + 1"  >/dev/null
-
+        #
+        [ -z "${SMATCH_CC}" ] || { CC="${SMATCH_CC}"; export CC; SMATCH="${SAVE_SMATCH}"; export SMATCH; }
         #
         # test c/s compilation w/ gpg