Changeset 206 for trunk/test/testrun_1b.sh

Timestamp:

Jan 8, 2009, 10:08:45 PM (16 years ago)

Author:

katerina

Message:

Fix for ticket #133 (improve port checking and its reporting to prelude).

File:

• trunk/test/testrun_1b.sh (modified) (3 diffs)

trunk/test/testrun_1b.sh

@@ -242 +242 @@
     rm -f $PW_DIR/test_log_prelude
 
+    [ -z "$verbose" ] || { echo " starting prelude-manager.."; echo " ($PM --textmod -l $PW_DIR/test_log_prelude --listen 127.0.0.1:5500 >/dev/null 2>&1 &)"; }
     "$PM" --textmod -l $PW_DIR/test_log_prelude --listen 127.0.0.1:5500 >/dev/null 2>&1 &
     PID=$!
@@ -266 +267 @@
     if [ $tmp -lt 1 ]; then
         [ -z "$verbose" ] || log_msg_fail "/etc";
+        kill $PID
+        return 1
     fi
     tmp=`egrep 'Classification text: Checking' test_log_prelude 2>/dev/null | wc -l`
     if [ $tmp -lt 1 ]; then
         [ -z "$verbose" ] || log_msg_fail "checking";
+        kill $PID
+        return 1
     fi
     #
@@ -276 +281 @@
         if [ $tmp -lt 1 ]; then
             [ -z "$verbose" ] || log_msg_fail "service";
+            kill $PID
+            return 1
         fi
         tmp=`egrep 'Service: port=5500' test_log_prelude 2>/dev/null | wc -l`
         if [ $tmp -lt 1 ]; then
             [ -z "$verbose" ] || log_msg_fail "port 5500";
+            kill $PID
+            return 1
         fi
     fi