Use std::lock_guard instead of STG_LOCKER.

[stg.git] / functest / test.sh

diff --git a/functest/test.sh b/functest/test.sh
index 921fa3f244eeda64e3b32cd70c55b7effce407ae..35bb62d9b6d0d598b7fd7b9f3131642e6d0d5800 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/projects/stargazer"
 
 cp "stuff/stargazer-files.conf" "$STGPATH/stargazer.conf"
 cp "stuff/rules" "$STGPATH/"
@@ -36,8 +38,8 @@ then
     GROUP=wheel
 fi
 
-sed -i "" "s|-STG-PATH-|$STGPATH|g" "$STGPATH/stargazer.conf"
-sed -i "" "s|-STG-GROUP-|$GROUP|g" "$STGPATH/stargazer.conf"
+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"`
@@ -68,6 +70,8 @@ done
 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"
 printf "\nTesting services:\n"
@@ -94,4 +98,6 @@ do
     sleep 1
 done
 
+cp "$STGPATH/stargazer.log" "$CURPATH/stargazer.log"
+
 printf "Stopped.\n"