X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/014356a786e82ad8da85a8cf0dba6b1035794436..cfe9172e73f17ebbd264ec37c138ebcf765bbeb0:/functest/test.sh diff --git a/functest/test.sh b/functest/test.sh index 921fa3f2..a463568f 100755 --- a/functest/test.sh +++ b/functest/test.sh @@ -2,6 +2,8 @@ BASEPATH=$1 +source `dirname $0`/functions + if [ "$BASEPATH" == "" ] then printf "Usage: $0 \n" @@ -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"