Changeset 30 for trunk/test/testrun_2.sh

Timestamp:

Apr 27, 2006, 10:40:32 PM (19 years ago)

Author:

rainer

Message:

Release candidate 3 for version 2.2.0

File:

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

trunk/test/testrun_2.sh

@@ -138 +138 @@
         REPLACEMENT="UseSeparateLogs=yes"
         ex $RCFILE <<EOF
-:%s/$ORIGINAL/$REPLACEMENT/g
-:wq
+%s/$ORIGINAL/$REPLACEMENT/g
+wq
 EOF
 # :%s is the "ex" substitution command.
@@ -182 +182 @@
             CLIENTLOG="${LOGFILE}.${remhost}"
         else
-            CLIENTLOG=`ls -1 ${LOGFILE}.* 2>/dev/null | tail -n 1`
+            tail -n 1 ${SCRIPTDIR}/test.sh >/dev/null 2>&1
+            if [ $? -eq 0 ]; then
+                CLIENTLOG=`ls -1 ${LOGFILE}.* 2>/dev/null | tail -n 1`
+            else
+                CLIENTLOG=`ls -1 ${LOGFILE}.* 2>/dev/null | tail -1`
+            fi
         fi
 
@@ -235 +240 @@
         REPLACEMENT_4="SetClientTimeLimit=20"
         ex $RCFILE <<EOF
-:%s/${ORIGINAL_1}/${REPLACEMENT_1}/g
-:%s/${ORIGINAL_2}/${REPLACEMENT_2}/g
-:%s/${ORIGINAL_3}/${REPLACEMENT_3}/g
-:%s/${ORIGINAL_4}/${REPLACEMENT_4}/g
-:wq
+%s/${ORIGINAL_1}/${REPLACEMENT_1}/g
+%s/${ORIGINAL_2}/${REPLACEMENT_2}/g
+%s/${ORIGINAL_3}/${REPLACEMENT_3}/g
+%s/${ORIGINAL_4}/${REPLACEMENT_4}/g
+wq
 EOF
 # :%s is the "ex" substitution command.
@@ -336 +341 @@
         REPLACEMENT_1="SetSocketAllowUid=$me"
         ex $RCFILE <<EOF
-:%s/${ORIGINAL_1}/${REPLACEMENT_1}/g
-:wq
+%s/${ORIGINAL_1}/${REPLACEMENT_1}/g
+wq
 EOF
 
@@ -435 +440 @@
 
         kill ${PROC_Y}
+        sleep 2
+        kill -9 ${PROC_Y} >/dev/null 2>&1
 
         [ -z "$VALGRIND" ] || {
@@ -633 +640 @@
         #
         cp samhain samhain.build || return 1
-        make clean >/dev/null || return 1
+        $MAKE clean >/dev/null || return 1
 
         ${TOP_SRCDIR}/configure --quiet  $TRUST --enable-debug --enable-network=server  --enable-xml-log --enable-login-watch --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=${RCFILE}2  --with-log-file=${LOGFILE}2 --with-pid-file=$PW_DIR/.samhain_lock2 --with-html-file=${HTML}2 --with-state-dir=$PW_DIR --enable-encrypt=2 --with-port=49778
@@ -655 +662 @@
         #
         cp yule yule.2 || return 1
-        make clean >/dev/null || return 1
+        $MAKE clean >/dev/null || return 1
 
         ${TOP_SRCDIR}/configure --quiet  $TRUST --enable-debug --enable-network=server  --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-html-file=$HTML --with-state-dir=$PW_DIR --enable-encrypt=2