Portable count.

[stg.git] / functest / test.sh

diff --git a/functest/test.sh b/functest/test.sh
index 62a8a5810946c8ec271eba695b17bfb7b8fe167e..333c45e02e0a42a0af9d897833b37729c8bf131d 100755 (executable)
--- a/functest/test.sh
+++ b/functest/test.sh
@@ -25,10 +25,13 @@ cp -R "stuff/db-stub" "$STGPATH/db"
 
 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"
 
+printf "Starting Stargazer... "
+
 "$STGPATH/stargazer" "$STGPATH" >> "$LOGFILE" 2>&1 &
 
 COUNT=""
@@ -51,19 +54,13 @@ done
 PID=`cat "$STGPATH/stargazer.pid"`
 printf "Started 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"
+printf "\nTesting admins:\n"
+"$CURPATH/test_admins.sh" "$BASEPATH"
+printf "\nTesting services:\n"
+"$CURPATH/test_services.sh" "$BASEPATH"
+printf "\n"
 
-printf "Stopping...\n"
+printf "Stopping... "
 kill $PID
 
 COUNT=""