Merge remote-tracking branch 'origin/master' into ticket

[stg.git] / functest / test.sh

diff --git a/functest/test.sh b/functest/test.sh
index 84f6196d2f5a4e1285fb31b0ebf9d0b58dd8c5eb..a463568f075075d5e64abb5acfd873a92dd7e466 100755 (executable)
--- a/functest/test.sh
+++ b/functest/test.sh
@@ -2,6 +2,8 @@
 
 BASEPATH=$1
 
 
 BASEPATH=$1
 

+source `dirname $0`/functions
+

 if [ "$BASEPATH" == "" ]
 then
     printf "Usage: $0 <path>\n"
 if [ "$BASEPATH" == "" ]
 then
     printf "Usage: $0 <path>\n"


@@ -23,13 +25,29 @@ cp "stuff/OnDisconnect" "$STGPATH/"
 cp "stuff/OnChange" "$STGPATH/"
 cp -R "stuff/db-stub" "$STGPATH/db"
 
 cp "stuff/OnChange" "$STGPATH/"
 cp -R "stuff/db-stub" "$STGPATH/db"
 

-sed -i "s|-STG-PATH-|$STGPATH|g" "$STGPATH/stargazer.conf"
+GROUP=root
+groups | grep root > /dev/null 2> /dev/null
+if [ "$?" != "0" ]
+then
+    groups | grep wheel > /dev/null 2> /dev/null
+    if [ "$?" != "0" ]
+    then
+        printf "Can't find neither 'root' nor 'wheel' group.\n"
+        exit -1
+    fi
+    GROUP=wheel
+fi
+
+subst "-STG-PATH-" "$STGPATH" "$STGPATH/stargazer.conf"
+subst "-STG-GROUP-" "$GROUP" "$STGPATH/stargazer.conf"

 
 CURPATH=`pwd`
 LOGFILE="$CURPATH/"`date "+%Y-%m-%d-%H%M%S.console.log"`
 
 cd "$STGPATH"
 
 
 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=""
 "$STGPATH/stargazer" "$STGPATH" >> "$LOGFILE" 2>&1 &
 
 COUNT=""


@@ -52,10 +70,15 @@ done
 PID=`cat "$STGPATH/stargazer.pid"`
 printf "Started with pid $PID\n"
 
 PID=`cat "$STGPATH/stargazer.pid"`
 printf "Started with pid $PID\n"
 

+printf "\nTesting server info:\n"
+"$CURPATH/test_server_info.sh" "$BASEPATH"
+printf "\nTesting admins:\n"

 "$CURPATH/test_admins.sh" "$BASEPATH"
 "$CURPATH/test_admins.sh" "$BASEPATH"

+printf "\nTesting services:\n"

 "$CURPATH/test_services.sh" "$BASEPATH"
 "$CURPATH/test_services.sh" "$BASEPATH"

+printf "\n"

 
 

-printf "Stopping...\n"
+printf "Stopping... "

 kill $PID
 
 COUNT=""
 kill $PID
 
 COUNT=""