Changeset 54 for trunk/test

Timestamp:

Jul 31, 2006, 11:40:27 PM (18 years ago)

Author:

rainer

Message:

Fix compile problem for stealth mode w\database

File:

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

trunk/test/testcompile.sh

@@ -20 +20 @@
 #
 
-MAXTEST=57; export MAXTEST
+MAXTEST=61; export MAXTEST
 
 run_flawfinder ()
@@ -253 +253 @@
             log_skip $num $MAXTEST 'gpg not in PATH'
             let "num = num + 1" >/dev/null
+            log_skip $num $MAXTEST 'gpg not in PATH'
         else
             if test -r "Makefile"; then
@@ -314 +315 @@
 
         #
+        # test standalone compilation w/mysql and stealth
+        #
+        TEST="${S}standalone w/mysql+stealth${E}"
+        #
+        if test -r "Makefile"; then
+                $MAKE clean
+        fi
+        #
+        ${TOP_SRCDIR}/configure --quiet --enable-xml-log --enable-stealth=128 --with-database=mysql  --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test > /dev/null 2>> test_log
+        #
+        let "num = num + 1" >/dev/null
+        testmake $? $num "skip" || let "numfail = numfail + 1" >/dev/null
+        let "num = num + 1" >/dev/null
+        run_smatch $? $num || let "numfail = numfail + 1"  >/dev/null
+
+        #
         # test standalone compilation w/postgresql
         #
@@ -323 +340 @@
         #
         ${TOP_SRCDIR}/configure --quiet --enable-xml-log --with-database=postgresql  --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test > /dev/null 2>> test_log
+        #
+        let "num = num + 1" >/dev/null
+        testmake $? $num "skip" || let "numfail = numfail + 1" >/dev/null
+        let "num = num + 1" >/dev/null
+        run_smatch $? $num || let "numfail = numfail + 1"  >/dev/null
+
+        #
+        # test standalone compilation w/postgresql+stealth
+        #
+        TEST="${S}standalone w/postgresql+stealth${E}"
+        #
+        if test -r "Makefile"; then
+                $MAKE clean
+        fi
+        #
+        ${TOP_SRCDIR}/configure --quiet --enable-xml-log --enable-stealth=128 --with-database=postgresql  --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test > /dev/null 2>> test_log
         #
         let "num = num + 1" >/dev/null
@@ -400 +433 @@
         if [ -z "$GPG" ]; then
             log_skip $num $MAXTEST 'gpg not in PATH'
-            let "num = num + 3" >/dev/null
+            let "num = num + 1" >/dev/null
+            log_skip $num $MAXTEST 'gpg not in PATH'
+            let "num = num + 1" >/dev/null
+            log_skip $num $MAXTEST 'gpg not in PATH'
+            let "num = num + 1" >/dev/null
+            log_skip $num $MAXTEST 'gpg not in PATH'
         else
             if test -r "Makefile"; then