Changeset 51 for trunk/test/testrun_2.sh

Timestamp:

Jul 17, 2006, 10:31:56 PM (18 years ago)

Author:

rainer

Message:

Fix problems with linux kernel 2.6.17

File:

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

trunk/test/testrun_2.sh

@@ -37 +37 @@
         ${VALGRIND} ./yule.2 -l info -p none >/dev/null 2>>test_log_valgrind &
         PROC_Y2=$!
-        sleep 5
+        five_sec_sleep
 
         [ -z "$verbose" ] || { 
@@ -48 +48 @@
             --server-port=49778 >/dev/null 2>>test_log_valgrind &
         PROC_Y=$!
-        sleep 5
+        five_sec_sleep
 
         [ -z "$verbose" ] || { 
@@ -68 +68 @@
         kill $PROC_Y
         kill $PROC_Y2
-        sleep 5
+        five_sec_sleep
 
         # cp ${LOGFILE}  triple_test
@@ -137 +137 @@
         ORIGINAL="UseSeparateLogs=no"
         REPLACEMENT="UseSeparateLogs=yes"
-        ex $RCFILE <<EOF
+        ex -s $RCFILE <<EOF
 %s/$ORIGINAL/$REPLACEMENT/g
 wq
@@ -154 +154 @@
         ${VALGRIND} ./yule -l info -p none >/dev/null 2>>test_log_valgrind &
         PROC_Y=$!
-        sleep 5
+        five_sec_sleep
 
         [ -z "$verbose" ] || { 
@@ -172 +172 @@
 
         kill $PROC_Y
-        sleep 5
+        five_sec_sleep
 
         if [ -f ${LOGFILE}.${SH_LOCALHOST} ]; then
@@ -242 +242 @@
         ORIGINAL_5="dir=1"
         REPLACEMENT_5="#dir=1"
-        ex $RCFILE <<EOF
+        ex -s $RCFILE <<EOF
 %s/${ORIGINAL_1}/${REPLACEMENT_1}/g
 %s/${ORIGINAL_2}/${REPLACEMENT_2}/g
@@ -263 +263 @@
         ${VALGRIND} ./yule -p none -e none >/dev/null 2>>test_log_valgrind &
         PROC_Y=$!
-        sleep 5
+        five_sec_sleep
 
         [ -z "$verbose" ] || { 
@@ -276 +276 @@
             # echo "PID is ${PROC_S}"
             [ -z "$verbose" ] || log_msg_ok    "samhain.new -t check";
-            sleep 5
+            five_sec_sleep
             # Redirect the shells (un-)helpful job monitoring messages.
             # The 'disown' buildin is not portable. 
@@ -293 +293 @@
 
         kill $PROC_Y
-        sleep 5
+        five_sec_sleep
 
         egrep "START(>|\").*Yule(>|\")" $LOGFILE >/dev/null 2>&1
@@ -340 +340 @@
 
         # 'id -u' is posix
-        me=`id -u`
+        if test -f /usr/xpg4/bin/id
+        then
+            me=`/usr/xpg4/bin/id -u`
+        else
+            me=`id -u`
+        fi
 
         ORIGINAL_1="SetSocketAllowUid=0"
         REPLACEMENT_1="SetSocketAllowUid=$me"
-        ex $RCFILE <<EOF
+        ex -s $RCFILE <<EOF
 %s/${ORIGINAL_1}/${REPLACEMENT_1}/g
 wq
@@ -361 +366 @@
             >/dev/null 2>>test_log_valgrind &
         PROC_Y=$!
-        sleep 5
+        five_sec_sleep
 
         [ -z "$verbose" ] || { 
@@ -444 +449 @@
 
         kill ${PROC_Y}
-        sleep 2
+        one_sec_sleep
+        one_sec_sleep
         kill -9 ${PROC_Y} >/dev/null 2>&1
 
@@ -499 +505 @@
             >/dev/null 2>>test_log_valgrind &
         PROC_Y=$!
-        sleep 5
+        five_sec_sleep
 
         egrep '<!-- head -->' $HTML >/dev/null 2>&1
@@ -533 +539 @@
 
         kill $PROC_Y
-        sleep 5
+        five_sec_sleep
 
         # rm -f head.html; rm -f foot.html; rm -f entry.html;