Changeset 415 for trunk/test

Timestamp:

Nov 1, 2012, 7:45:54 AM (12 years ago)

Author:

katerina

Message:

Fixes for tickets #314, #315, #316, #317, #318, #319, #320, and #321.

File:

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

trunk/test/testrun_2.sh

@@ -537 +537 @@
         fi
 
+        cp $HTML  ${HTML}.tmp
+
         kill $PROC_Y
         five_sec_sleep
@@ -568 +570 @@
         fi
 
-        egrep '<!-- head -->' $HTML >/dev/null 2>&1
+        egrep '<!-- head -->' ${HTML}.tmp >/dev/null 2>&1
         if [ $? -ne 0 ]; then
             [ -z "$verbose" ] || log_msg_fail "head.html";
             return 1
         fi
-        egrep '<!-- ehead -->' $HTML >/dev/null 2>&1
+        egrep '<!-- ehead -->' ${HTML}.tmp >/dev/null 2>&1
         if [ $? -ne 0 ]; then
             [ -z "$verbose" ] || log_msg_fail "end head.html";
@@ -579 +581 @@
         fi
 
-        egrep '<!-- entry -->' $HTML >/dev/null 2>&1
+        egrep '<!-- entry -->' ${HTML}.tmp >/dev/null 2>&1
         if [ $? -ne 0 ]; then
             [ -z "$verbose" ] || log_msg_fail "entry.html";
             return 1
         fi
-        egrep '<!-- eentry -->' $HTML >/dev/null 2>&1
+        egrep '<!-- eentry -->' ${HTML}.tmp >/dev/null 2>&1
         if [ $? -ne 0 ]; then
             [ -z "$verbose" ] || log_msg_fail "end entry.html";
@@ -590 +592 @@
         fi
 
-        egrep '<!-- foot -->' $HTML >/dev/null 2>&1
+        egrep '<!-- foot -->' ${HTML}.tmp >/dev/null 2>&1
         if [ $? -ne 0 ]; then
             [ -z "$verbose" ] || log_msg_fail "foot.html";
             return 1
         fi
-        egrep '<!-- efoot -->' $HTML >/dev/null 2>&1
+        egrep '<!-- efoot -->' ${HTML}.tmp >/dev/null 2>&1
         if [ $? -ne 0 ]; then
             [ -z "$verbose" ] || log_msg_fail "end foot.html";
@@ -609 +611 @@
             fi;
         }
+
+        rm ${HTML}.tmp
 
         return 0