Show working dir in tests.

[stg.git] / functest / test.sh

diff --git a/functest/test.sh b/functest/test.sh
index 62a8a5810946c8ec271eba695b17bfb7b8fe167e..51a0638562c3738912086c95a5b2f4de9b0b553c 100755 (executable)
--- a/functest/test.sh
+++ b/functest/test.sh
@@ -25,7 +25,8 @@ cp -R "stuff/db-stub" "$STGPATH/db"
 
 sed -i "s|-STG-PATH-|$STGPATH|g" "$STGPATH/stargazer.conf"
 
 
 sed -i "s|-STG-PATH-|$STGPATH|g" "$STGPATH/stargazer.conf"
 

-LOGFILE=`pwd`"/"`date "+%Y-%m-%d-%H%M%S.console.log"`
+CURPATH=`pwd`
+LOGFILE="$CURPATH/"`date "+%Y-%m-%d-%H%M%S.console.log"`

 
 cd "$STGPATH"
 
 
 cd "$STGPATH"
 


@@ -49,19 +50,10 @@ do
 done
 
 PID=`cat "$STGPATH/stargazer.pid"`
 done
 
 PID=`cat "$STGPATH/stargazer.pid"`

-printf "Started with pid $PID\n"
+printf "\nStarted with pid $PID\n"

 
 

-SGCONFPATH="$BASEPATH/stg/projects/sgconf"
-
-RES=`"$SGCONFPATH/sgconf" -s localhost -p 5555 -u admin -w 123456 --get-admins`
-
-if [ "$?" != "0" ]
-then
-    printf "Failed to get admins list. Result:\n$RES\n"
-    exit 0
-fi
-
-printf "Got admins list:\n$RES\n"
+"$CURPATH/test_admins.sh" "$BASEPATH"
+"$CURPATH/test_services.sh" "$BASEPATH"

 
 printf "Stopping...\n"
 kill $PID
 
 printf "Stopping...\n"
 kill $PID