Move some includes.

[stg.git] / functest / test.sh

diff --git a/functest/test.sh b/functest/test.sh
index 51a0638562c3738912086c95a5b2f4de9b0b553c..00728cc8adf31edfa65780a4f534aad93809824d 100755 (executable)
--- a/functest/test.sh
+++ b/functest/test.sh
@@ -2,6 +2,8 @@
 
 BASEPATH=$1
 
+source `dirname $0`/functions
+
 if [ "$BASEPATH" == "" ]
 then
     printf "Usage: $0 <path>\n"
@@ -14,7 +16,7 @@ then
     exit -1
 fi
 
-STGPATH="$BASEPATH/stg/projects/stargazer"
+STGPATH="$BASEPATH/stg/build/stargazer"
 
 cp "stuff/stargazer-files.conf" "$STGPATH/stargazer.conf"
 cp "stuff/rules" "$STGPATH/"
@@ -23,13 +25,29 @@ cp "stuff/OnDisconnect" "$STGPATH/"
 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"
 
+printf "Starting Stargazer... "
+
 "$STGPATH/stargazer" "$STGPATH" >> "$LOGFILE" 2>&1 &
 
 COUNT=""
@@ -50,12 +68,17 @@ do
 done
 
 PID=`cat "$STGPATH/stargazer.pid"`
-printf "\nStarted with pid $PID\n"
+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"
+printf "\nTesting services:\n"
 "$CURPATH/test_services.sh" "$BASEPATH"
+printf "\n"
 
-printf "Stopping...\n"
+printf "Stopping... "
 kill $PID
 
 COUNT=""