From 99fade270adc9d9353a5e9b4ce659737cca1f56a Mon Sep 17 00:00:00 2001
From: eutarass
Date: Wed, 18 Aug 2010 03:46:08 +0000
Subject: TCF Agent: fixed multiple minor issues in debug services
 implementation that were found by automated tests, most of them are Windows
 specific

---
 tests/test-all | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

(limited to 'tests/test-all')

diff --git a/tests/test-all b/tests/test-all
index e5d59a023..fd655f194 100755
--- a/tests/test-all
+++ b/tests/test-all
@@ -238,7 +238,7 @@ function build_and_start_server()
     echo "<img src=\"../icons/accept.png\" title=\"Server OK\"/>" >>$HTML
     local SERVER_LFILE=$BUILD/logs/server-$HOST.txt
     if [ $OPSYS = Windows ] ; then
-      local SERVER_LFILE=`$SSH "cygpath -m %SERVER_LFILE"`
+      local SERVER_LFILE=`$SSH "cygpath -m $SERVER_LFILE"`
     fi
     $SSH "$TRUNK/server/obj/$OPSYS/$MACHINE/$CONF/server -s TCP::1535 -L$SERVER_LFILE -l0x800" >>logs/$LOGFILE 2>&1 &
   else
@@ -273,7 +273,7 @@ function build_and_test_agent()
   then
     local AGENT_LFILE=$BUILD/logs/agent-$HOST.txt
     if [ $OPSYS = Windows ] ; then
-      local AGENT_LFILE=`$SSH "cygpath -m %AGENT_LFILE"`
+      local AGENT_LFILE=`$SSH "cygpath -m $AGENT_LFILE"`
     fi
     $SSH "$TRUNK/agent/obj/$OPSYS/$MACHINE/$CONF/agent -s TCP::1534 -L$AGENT_LFILE -l0" >>logs/$LOGFILE 2>&1 &
     sleep 15
@@ -287,14 +287,8 @@ function build_and_test_agent()
       $TESTURL1 \
       >>logs/$LOGFILE 2>&1
     then
-      echo >>logs/$LOGFILE
-      echo "Starting tests, target: $TESTURL2 $TESTURL1" >>logs/$LOGFILE
-      if time -p java -ea \
-        -classpath java-bin \
-        org.eclipse.tm.internal.tcf.debug.tests.Main \
-        $TESTURL2 $TESTURL1 \
-        >>logs/$LOGFILE 2>&1
-      then
+      if [ "$OPSYS" = Windows -a ! -z "$CFLAGS" ] ; then
+        # TCF server does not support PE object files
         if [ -s logs/agent-$HOST.txt ]
         then
           echo "<img src=\"../icons/error.png\" title=\"Agent log is not empty\"/>" >>$HTML
@@ -302,7 +296,23 @@ function build_and_test_agent()
           echo "<img src=\"../icons/accept.png\" title=\"Agent OK\"/>" >>$HTML
         fi
       else
-        echo "<img src=\"../icons/cancel.png\" title=\"Agent/Server test failed\"/>" >>$HTML
+        echo >>logs/$LOGFILE
+        echo "Starting tests, target: $TESTURL2 $TESTURL1" >>logs/$LOGFILE
+        if time -p java -ea \
+          -classpath java-bin \
+          org.eclipse.tm.internal.tcf.debug.tests.Main \
+          $TESTURL2 $TESTURL1 \
+          >>logs/$LOGFILE 2>&1
+        then
+          if [ -s logs/agent-$HOST.txt ]
+          then
+            echo "<img src=\"../icons/error.png\" title=\"Agent log is not empty\"/>" >>$HTML
+          else
+            echo "<img src=\"../icons/accept.png\" title=\"Agent OK\"/>" >>$HTML
+          fi
+        else
+          echo "<img src=\"../icons/cancel.png\" title=\"Agent/Server test failed\"/>" >>$HTML
+        fi
       fi
     else
       echo "<img src=\"../icons/cancel.png\" title=\"Agent test failed\"/>" >>$HTML
-- 
cgit v1.2.3