Merge remote-tracking branch 'github/master'

[stg.git] / functest / test.sh

diff --git a/functest/test.sh b/functest/test.sh
index 84816ef440605a275a1d4caf805113d2fd1f34c7..35bb62d9b6d0d598b7fd7b9f3131642e6d0d5800 100755 (executable)
--- a/functest/test.sh
+++ b/functest/test.sh
@@ -16,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/"
@@ -70,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"
@@ -96,4 +98,6 @@ do
     sleep 1
 done
 
+cp "$STGPATH/stargazer.log" "$CURPATH/stargazer.log"
+
 printf "Stopped.\n"