From 522fa51446d7f6230e6819fb3e51fe744bcf13cc Mon Sep 17 00:00:00 2001
From: Eugene Tarassov
Date: Mon, 14 Nov 2011 11:49:55 -0800
Subject: TCF Tests: fixed TCF source directory names in test-all script.

---
 tests/test-all | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'tests')

diff --git a/tests/test-all b/tests/test-all
index d15f6bf11..5bbe9aa67 100755
--- a/tests/test-all
+++ b/tests/test-all
@@ -240,17 +240,17 @@ function build_and_test_agent()
   local BUILD_ERROR=
   local TEST_ERROR=
   local TEST_WARNING=
-  if $SSH "cd $AGENT; time -p $MAKE `get_make_options` clean all" >>logs/$LOGFILE 2>&1
+  if $SSH "cd $AGENT/agent; time -p $MAKE `get_make_options` clean all" >>logs/$LOGFILE 2>&1
   then
     if [ $SEQ = 1 ] ; then
-      $SSH "$AGENT/obj/$OPSYS/$MACHINE/$CONF/agent -c" >>logs/$LOGFILE 2>&1
+      $SSH "$AGENT/agent/obj/$OPSYS/$MACHINE/$CONF/agent -c" >>logs/$LOGFILE 2>&1
     fi
     if [ $OPSYS = Windows ] ; then
       local AGENT_L_OPT=-L`$SSH "cygpath -m $VMBUILD/logs/agent-$HOST.txt"`
     else
       local AGENT_L_OPT=-L$VMBUILD/logs/agent-$HOST.txt
     fi
-    $SSH -f "$AGENT/obj/$OPSYS/$MACHINE/$CONF/agent -s TCP::1534 $AGENT_L_OPT -l0" >>logs/$LOGFILE 2>&1
+    $SSH -f "$AGENT/agent/obj/$OPSYS/$MACHINE/$CONF/agent -s TCP::1534 $AGENT_L_OPT -l0" >>logs/$LOGFILE 2>&1
     sleep 15
     TESTURL1=TransportName=TCP:Host=$HOST:Port=1534
     TESTURL2=TransportName=TCP:Host=$HOST:Port=1535
@@ -312,7 +312,7 @@ function build_and_test_agent()
           TESTURL1=TransportName=TCP:Host=localhost:Port=1534
           ;;
         esac
-        $SSH -f "$AGENT/obj/$OPSYS/$MACHINE/$CONF/agent -s $AGENT_S_OPT $AGENT_L_OPT -l0" >>logs/$LOGFILE 2>&1
+        $SSH -f "$AGENT/agent/obj/$OPSYS/$MACHINE/$CONF/agent -s $AGENT_S_OPT $AGENT_L_OPT -l0" >>logs/$LOGFILE 2>&1
         sleep 25
         echo >>logs/$LOGFILE
         echo "Starting tests, target: $TESTURL2 $TESTURL1" >>logs/$LOGFILE
@@ -356,7 +356,7 @@ function build_and_test_agent()
   echo "</a>" >>$HTML
 
   sleep 5
-  $SSH "cd $AGENT; rm -rf obj" >>logs/$LOGFILE 2>&1
+  $SSH "cd $AGENT/agent; rm -rf obj" >>logs/$LOGFILE 2>&1
 }
 
 function test_one_conf()
@@ -430,7 +430,7 @@ function build_rpm()
   echo RPM build on $VM >logs/$HOST-RPM.txt
   if [ -z "$BUILD_RPM" ] ; then
     echo "<img src=\"../icons/error.png\" title=\"Not supported\"/>" >>$HTML
-  elif $SSH "cd $AGENT; $MAKE clean rpm" >>logs/$HOST-RPM.txt 2>&1 ; then
+  elif $SSH "cd $AGENT/agent; $MAKE clean rpm" >>logs/$HOST-RPM.txt 2>&1 ; then
     echo "<img src=\"../icons/accept.png\" title=\"OK\"/>" >>$HTML
   else
     echo "<img src=\"../icons/cross.png\" title=\"Failed\"/>" >>$HTML
-- 
cgit v1.2.3