Fix funtests to work with the new build system.

diff --git a/functest/build.sh b/functest/build.sh
index a84e9e0d8c07e307fc09f2db0904f151333a4952..e5c47a8be1f00598919d45c37f5faee8b9bbc62a 100755 (executable)
--- a/functest/build.sh
+++ b/functest/build.sh
@@ -14,12 +14,8 @@ then
     exit -1
 fi
 
     exit -1
 fi
 

-cd "$BASEPATH/stg/projects/stargazer"
-./build debug
-make clean
-make
-
-cd "$BASEPATH/stg/projects/sgconf"
-./build debug
-make clean
+cd "$BASEPATH/stg"
+mkdir build
+cd build
+cmake -DBUILD_STG=ON -DBUILD_SGCONF=ON ..

 make
 make

diff --git a/functest/stuff/stargazer-files.conf b/functest/stuff/stargazer-files.conf
index c4e0bd3e7528390bb727bf5979f036340e680b5c..a0db4456a2b18abe12ef1e870b93d1326fa4c4f6 100644 (file)
--- a/functest/stuff/stargazer-files.conf
+++ b/functest/stuff/stargazer-files.conf
@@ -1,7 +1,7 @@
 PidFile = -STG-PATH-/stargazer.pid
 LogFile = -STG-PATH-/stargazer.log
 Rules = -STG-PATH-/rules
 PidFile = -STG-PATH-/stargazer.pid
 LogFile = -STG-PATH-/stargazer.log
 Rules = -STG-PATH-/rules

-ModulesPath = -STG-PATH-/modules
+ModulesPath = -STG-PATH-/plugins

 DetailStatWritePeriod=1/6
 StatWritePeriod = 10
 DayFee = 1
 DetailStatWritePeriod=1/6
 StatWritePeriod = 10
 DayFee = 1

diff --git a/functest/test.sh b/functest/test.sh
index a463568f075075d5e64abb5acfd873a92dd7e466..00728cc8adf31edfa65780a4f534aad93809824d 100755 (executable)
--- a/functest/test.sh
+++ b/functest/test.sh
@@ -16,7 +16,7 @@ then
     exit -1
 fi
 
     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/"
 
 cp "stuff/stargazer-files.conf" "$STGPATH/stargazer.conf"
 cp "stuff/rules" "$STGPATH/"

diff --git a/functest/test_admins.sh b/functest/test_admins.sh
index dae254ba0aa6cb392428c3e973004a0773ef85c2..3bedb37a46a7e17acc0ad0cb472550763a692d16 100755 (executable)
--- a/functest/test_admins.sh
+++ b/functest/test_admins.sh
@@ -4,7 +4,7 @@ source `dirname $0`/functions
 
 BASEPATH=$1
 
 
 BASEPATH=$1
 

-SGCONFPATH="$BASEPATH/stg/projects/sgconf"
+SGCONFPATH="$BASEPATH/stg/build/sgconf"

 
 printf "Check initial admin list... "
 
 
 printf "Check initial admin list... "
 

diff --git a/functest/test_server_info.sh b/functest/test_server_info.sh
index caf01bca89933b1c4ca6a4ce8653c8e9e6283179..f41f470e9bbe46e5e15fe4246842a51ff94fae18 100755 (executable)
--- a/functest/test_server_info.sh
+++ b/functest/test_server_info.sh
@@ -4,7 +4,7 @@ source `dirname $0`/functions
 
 BASEPATH=$1
 
 
 BASEPATH=$1
 

-SGCONFPATH="$BASEPATH/stg/projects/sgconf"
+SGCONFPATH="$BASEPATH/stg/build/sgconf"

 
 printf "Check server info... "
 
 
 printf "Check server info... "
 

diff --git a/functest/test_services.sh b/functest/test_services.sh
index 0b8a2a8c7030ca1422679e0567a07a19cd9801bf..aaca9d01da185d3158667e6feae36e52bdf4e0b0 100755 (executable)
--- a/functest/test_services.sh
+++ b/functest/test_services.sh
@@ -4,7 +4,7 @@ source `dirname $0`/functions
 
 BASEPATH=$1
 
 
 BASEPATH=$1
 

-SGCONFPATH="$BASEPATH/stg/projects/sgconf"
+SGCONFPATH="$BASEPATH/stg/build/sgconf"

 
 printf "Check initial service list... "
 
 
 printf "Check initial service list... "