Changeset 145 for trunk/test

Timestamp:

Nov 8, 2007, 10:35:23 PM (17 years ago)

Author:

rainer

Message:

Fix for ticket #81 (compile failure with --enable-static).

Location:

trunk/test

Files:

• testcompile.sh (modified) (3 diffs)
• testrun_1a.sh (modified) (1 diff)

trunk/test/testcompile.sh

@@ -20 +20 @@
 #
 
-MAXTEST=65; export MAXTEST
+MAXTEST=71; export MAXTEST
 
 run_flawfinder ()
@@ -181 +181 @@
         # test standalone compilation
         #
+        TEST="${S}standalone static w/suidcheck w/procchk${E}"
+        #
+        if test -r "Makefile"; then
+                $MAKE distclean 
+        fi
+        #
+        ${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
+        #
+        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
+
+        #
+        # test standalone compilation
+        #
         TEST="${S}standalone w/procchk w/portchk${E}"
         #
@@ -450 +466 @@
         #
         ${TOP_SRCDIR}/configure --quiet --enable-network=server  --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   
+        #
+        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
+
+        #
+        # test client/server compilation
+        #
+        TEST="${S}client/server application static w/timeserver${E}"
+        #
+        if test -r "Makefile"; then
+                $MAKE clean
+        fi
+        #
+        ${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   
+        #
+        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
+        
+        if test -r "Makefile"; then
+                $MAKE clean
+        fi
+        #
+        ${TOP_SRCDIR}/configure --quiet --enable-network=server  --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   
         #
         let "num = num + 1" >/dev/null

trunk/test/testrun_1a.sh

@@ -20 +20 @@
 #
 
-PREBUILDOPTS="--quiet $TRUST --enable-debug --enable-xml-log --enable-login-watch --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$RCFILE --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --with-data-file=$PW_DIR/.samhain_file"
+PREBUILDOPTS="--quiet $TRUST --enable-debug --enable-static --enable-xml-log --enable-login-watch --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$RCFILE --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --with-data-file=$PW_DIR/.samhain_file"
 export PREBUILDOPTS