From 783ed451825ea18f1bec2502cb3fcecda653234a Mon Sep 17 00:00:00 2001 From: Maksym Mamontov Date: Sun, 19 Jan 2020 19:42:11 +0200 Subject: [PATCH 1/1] Fix funtests to work with the new build system. --- functest/build.sh | 12 ++++-------- functest/stuff/stargazer-files.conf | 2 +- functest/test.sh | 2 +- functest/test_admins.sh | 2 +- functest/test_server_info.sh | 2 +- functest/test_services.sh | 2 +- 6 files changed, 9 insertions(+), 13 deletions(-) diff --git a/functest/build.sh b/functest/build.sh index a84e9e0d..e5c47a8b 100755 --- a/functest/build.sh +++ b/functest/build.sh @@ -14,12 +14,8 @@ then 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 diff --git a/functest/stuff/stargazer-files.conf b/functest/stuff/stargazer-files.conf index c4e0bd3e..a0db4456 100644 --- 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 -ModulesPath = -STG-PATH-/modules +ModulesPath = -STG-PATH-/plugins DetailStatWritePeriod=1/6 StatWritePeriod = 10 DayFee = 1 diff --git a/functest/test.sh b/functest/test.sh index a463568f..00728cc8 100755 --- 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/stargazer" 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 dae254ba..3bedb37a 100755 --- a/functest/test_admins.sh +++ b/functest/test_admins.sh @@ -4,7 +4,7 @@ source `dirname $0`/functions BASEPATH=$1 -SGCONFPATH="$BASEPATH/stg/projects/sgconf" +SGCONFPATH="$BASEPATH/stg/build/sgconf" printf "Check initial admin list... " diff --git a/functest/test_server_info.sh b/functest/test_server_info.sh index caf01bca..f41f470e 100755 --- a/functest/test_server_info.sh +++ b/functest/test_server_info.sh @@ -4,7 +4,7 @@ source `dirname $0`/functions BASEPATH=$1 -SGCONFPATH="$BASEPATH/stg/projects/sgconf" +SGCONFPATH="$BASEPATH/stg/build/sgconf" printf "Check server info... " diff --git a/functest/test_services.sh b/functest/test_services.sh index 0b8a2a8c..aaca9d01 100755 --- a/functest/test_services.sh +++ b/functest/test_services.sh @@ -4,7 +4,7 @@ source `dirname $0`/functions BASEPATH=$1 -SGCONFPATH="$BASEPATH/stg/projects/sgconf" +SGCONFPATH="$BASEPATH/stg/build/sgconf" printf "Check initial service list... " -- 2.44.2