hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Combine regression test suite and main CMake projects

Browse Source 
Combining the projects makes it easier to use common components. This
fixes the build failure of maxutils due to missing jansson definitions.
This commit is contained in:
Markus Mäkelä
2018-08-17 13:44:55 +03:00
parent c7a6d75ab9
commit f09afa2967
11 changed files with 29 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
maxscale-system-test/mdbci/run_test.sh
View File

@ -64,9 +64,11 @@ res=$?
ulimit -c unlimited
if [ $res == 0 ] ; then
. ${script_dir}/set_env.sh $name
cd ${script_dir}/..
cd ${script_dir}/../../
mkdir build && cd build
cmake .. -DBUILDNAME=$name -DCMAKE_BUILD_TYPE=Debug
cmake ../../ -DWITH_SYSTEM_TESTS -DBUILDNAME=$name -DCMAKE_BUILD_TYPE=Debug
cd maxscale-system-test
make
if [ ! -z "${named_test}" ] ; then
@ -82,7 +84,7 @@ if [ $res == 0 ] ; then
exit 1
fi
${mdbci_dir}/mdbci snapshot take --path-to-nodes $name --snapshot-name clean
ctest -VV -D Nightly ${test_set}
ctest -VV ${test_set}
fi
cp core.* ${logs_publish_dir}
${script_dir}/copy_logs.sh

6
maxscale-system-test/mdbci/run_test_snapshot.sh
View File

@ -69,15 +69,17 @@ checkExitStatus $? "Error installing Maxscale" $snapshot_lock_file
cd ${script_dir}/..
rm -rf build
mkdir build && cd build
cmake .. -DBUILDNAME=$JOB_NAME-$BUILD_NUMBER-$target
cmake ../../ -DBUILDNAME=$JOB_NAME-$BUILD_NUMBER-$target -DBUILD_SYSTEM_TESTS=Y
cd maxscale-system-test
make
./check_backend --restart-galera
checkExitStatus $? "Failed to check backends" $snapshot_lock_file
ulimit -c unlimited
ctest $test_set -VV -D Nightly
ctest $test_set -VV
cp core.* ${logs_publish_dir}
${script_dir}/copy_logs.sh