Changeset 257 for trunk/test/testcompile.sh

Timestamp:

Oct 31, 2009, 8:53:58 PM (15 years ago)

Author:

katerina

Message:

Fix for issues with debug code and testsuite (tickets #174, #175).

File:

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

trunk/test/testcompile.sh

@@ -179 +179 @@
                 echo getenv >> list_null_funcs_uniq;
                 cat $i | ./deference_check.pl |\
-                     egrep -v 'x_trustfile.c ... ... sl_trustfile';
+                     egrep -v 'x_trustfile.c ... ... sl_trustfile' | \
+                     egrep -v 'x_sh_mem.c ';
                 rm -f list_null_funcs_uniq;
                 # rm -f $i
@@ -262 +263 @@
         numfail=0
 
+        
+        C_LOGFILE=""
+
+        ls /lib/libpcre* >/dev/null 2>&1
+        if [ $? -eq 0 ]; then
+            C_LOGFILE=" --enable-logfile-monitor "
+        else
+            ls /usr/lib/libpcre* >/dev/null 2>&1
+            if [ $? -eq 0 ]; then
+                C_LOGFILE=" --enable-logfile-monitor "
+            else
+                ls /usr/local/lib/libpcre* >/dev/null 2>&1
+                if [ $? -eq 0 ]; then
+                    C_LOGFILE=" --enable-logfile-monitor "
+                fi
+            fi
+        fi
+        if [ x"${C_LOGFILE}" = x ]; then
+            log_msg_ok  "Not testing  --enable-logfile-monitor";
+        fi
+
         #
         # test dnmalloc
@@ -319 +341 @@
         [ -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 --enable-logfile-monitor > /dev/null 2>> test_log
+        ${TOP_SRCDIR}/configure --quiet  --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test  --enable-static --enable-suidcheck --enable-process-check ${C_LOGFILE} > /dev/null 2>> test_log
         #
         let "num = num + 1" >/dev/null
@@ -429 +451 @@
         fi
         #
-        ${TOP_SRCDIR}/configure --quiet  --prefix=$PW_DIR --enable-nocl="owl" --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test  --enable-logfile-monitor > /dev/null 2>> test_log   
+        ${TOP_SRCDIR}/configure --quiet  --prefix=$PW_DIR --enable-nocl="owl" --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test ${C_LOGFILE} > /dev/null 2>> test_log   
         #
         let "num = num + 1" >/dev/null
@@ -670 +692 @@
         [ -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   --enable-logfile-monitor > /dev/null 2>> test_log   
+        ${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 ${C_LOGFILE} > /dev/null 2>> test_log   
         #
         let "num = num + 1" >/dev/null
@@ -726 +748 @@
             fi
             #
-            ${TOP_SRCDIR}/configure --quiet --enable-network=client  --enable-srp --with-gpg=$GPG  --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test   --enable-logfile-monitor > /dev/null 2>> test_log   
+            ${TOP_SRCDIR}/configure --quiet --enable-network=client  --enable-srp --with-gpg=$GPG  --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test ${C_LOGFILE} > /dev/null 2>> test_log   
             #
             let "num = num + 1" >/dev/null
@@ -790 +812 @@
         fi
         #
-        ${TOP_SRCDIR}/configure --quiet --enable-network=client --enable-debug --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test   --enable-logfile-monitor > /dev/null 2>> test_log   
+        ${TOP_SRCDIR}/configure --quiet --enable-network=client --enable-debug --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test ${C_LOGFILE} > /dev/null 2>> test_log   
         #
         let "num = num + 1" >/dev/null