Changeset 342 for trunk/test

Timestamp:

May 11, 2011, 11:04:08 PM (14 years ago)

Author:

katerina

Message:

Fix for ticket #251:Compile error if option --with-prelude is used

File:

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

trunk/test/testcompile.sh

@@ -21 +21 @@
 
 # dnmalloc + flawfinder + (36 * 3)
-MAXTEST=110; export MAXTEST
+MAXTEST=116; export MAXTEST
 
 run_dnmalloc ()
@@ -685 +685 @@
 
         #
+        # test client/server compilation w/prelude
+        #
+        TEST="${S}client/server application w/prelude${E}"
+        #
+        if [ -z "$doall" ]; then
+            let "num = num + 1" >/dev/null
+            [ -z "$quiet" ] && log_skip $2 ${MAXTEST} "$TEST";
+            let "num = num + 1" >/dev/null
+            [ -z "$quiet" ] && log_skip $2 ${MAXTEST} "$TEST (smatch)";
+            let "num = num + 1" >/dev/null
+            [ -z "$quiet" ] && log_skip $2 ${MAXTEST} "$TEST (uno)";
+
+            let "num = num + 1" >/dev/null
+            [ -z "$quiet" ] && log_skip $2 ${MAXTEST} "$TEST";
+            let "num = num + 1" >/dev/null
+            [ -z "$quiet" ] && log_skip $2 ${MAXTEST} "$TEST (smatch)";
+            let "num = num + 1" >/dev/null
+            [ -z "$quiet" ] && log_skip $2 ${MAXTEST} "$TEST (uno)";
+        else
+            if test -r "Makefile"; then
+                $MAKE clean
+            fi
+            #
+            ${TOP_SRCDIR}/configure --quiet --enable-network=client  --enable-srp --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test   --with-prelude > /dev/null 2>> test_log   
+            #
+            let "num = num + 1" >/dev/null
+            testmake $? $num || let "numfail = numfail + 1" >/dev/null
+            let "num = num + 1" >/dev/null
+            run_smatch $? $num || let "numfail = numfail + 1"  >/dev/null
+            let "num = num + 1" >/dev/null
+            run_uno $? $num || let "numfail = numfail + 1"  >/dev/null
+            
+            if test -r "Makefile"; then
+                $MAKE clean
+            fi
+            #
+            ${TOP_SRCDIR}/configure --quiet --enable-network=server  --enable-srp --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test   --with-prelude > /dev/null 2>> test_log   
+            #
+            let "num = num + 1" >/dev/null
+            testmake $? $num || let "numfail = numfail + 1" >/dev/null
+            let "num = num + 1" >/dev/null
+            run_smatch $? $num || let "numfail = numfail + 1"  >/dev/null
+            let "num = num + 1" >/dev/null
+            run_uno $? $num || let "numfail = numfail + 1"  >/dev/null
+            #
+        fi
+
+        #
         # test client/server compilation
         #