diff --git a/BUILD/install_test_build_deps.sh b/BUILD/install_test_build_deps.sh index d77a90573..5489726a7 100755 --- a/BUILD/install_test_build_deps.sh +++ b/BUILD/install_test_build_deps.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Installs all build dependecies for maxscale-system-test +# Installs all build dependencies for system tests # Only Ubuntu Bionic/Xenial, CentOS 7, SLES 15 are supported rp=`realpath $0` diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a3c4f38d..f610084bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,7 +197,7 @@ if(BUILD_TESTS) endif() if(BUILD_SYSTEM_TESTS) - add_subdirectory(maxscale-system-test) + add_subdirectory(system-test) endif() # Generate text versions of some documents diff --git a/maxscale-system-test b/maxscale-system-test new file mode 120000 index 000000000..f8ae3aabd --- /dev/null +++ b/maxscale-system-test @@ -0,0 +1 @@ +system-test/ \ No newline at end of file diff --git a/script/maxscale-set-change-date b/script/maxscale-set-change-date index 096947910..d2261ed03 100755 --- a/script/maxscale-set-change-date +++ b/script/maxscale-set-change-date @@ -15,7 +15,7 @@ SCRIPT="$(cd -P "$(dirname "${BASH_SOURCE[0]}")" && pwd)" MAXSCALE_ROOT=${SCRIPT}/.. -DIRS="connectors etc examples include maxctrl maxscale-system-test maxutils query_classifier script server" +DIRS="connectors etc examples include maxctrl system-test maxutils query_classifier script server" function check_dirs { diff --git a/maxscale-system-test/CMakeLists.txt b/system-test/CMakeLists.txt similarity index 100% rename from maxscale-system-test/CMakeLists.txt rename to system-test/CMakeLists.txt diff --git a/maxscale-system-test/CTestConfig.cmake b/system-test/CTestConfig.cmake similarity index 100% rename from maxscale-system-test/CTestConfig.cmake rename to system-test/CTestConfig.cmake diff --git a/maxscale-system-test/Documentation/BUILD_TEST_DEBUG.md b/system-test/Documentation/BUILD_TEST_DEBUG.md similarity index 100% rename from maxscale-system-test/Documentation/BUILD_TEST_DEBUG.md rename to system-test/Documentation/BUILD_TEST_DEBUG.md diff --git a/maxscale-system-test/Documentation/DEBUG_ENVIRONMENT.md b/system-test/Documentation/DEBUG_ENVIRONMENT.md similarity index 100% rename from maxscale-system-test/Documentation/DEBUG_ENVIRONMENT.md rename to system-test/Documentation/DEBUG_ENVIRONMENT.md diff --git a/maxscale-system-test/Documentation/LOCAL_DEPLOYMENT.md b/system-test/Documentation/LOCAL_DEPLOYMENT.md similarity index 100% rename from maxscale-system-test/Documentation/LOCAL_DEPLOYMENT.md rename to system-test/Documentation/LOCAL_DEPLOYMENT.md diff --git a/maxscale-system-test/Documentation/README.md b/system-test/Documentation/README.md similarity index 100% rename from maxscale-system-test/Documentation/README.md rename to system-test/Documentation/README.md diff --git a/maxscale-system-test/Documentation/RELEASE.md b/system-test/Documentation/RELEASE.md similarity index 100% rename from maxscale-system-test/Documentation/RELEASE.md rename to system-test/Documentation/RELEASE.md diff --git a/maxscale-system-test/Documentation/RUN_TEST.md b/system-test/Documentation/RUN_TEST.md similarity index 100% rename from maxscale-system-test/Documentation/RUN_TEST.md rename to system-test/Documentation/RUN_TEST.md diff --git a/maxscale-system-test/ENV_SETUP.md b/system-test/ENV_SETUP.md similarity index 100% rename from maxscale-system-test/ENV_SETUP.md rename to system-test/ENV_SETUP.md diff --git a/maxscale-system-test/HOW_TO_WRITE_TEST.md b/system-test/HOW_TO_WRITE_TEST.md similarity index 100% rename from maxscale-system-test/HOW_TO_WRITE_TEST.md rename to system-test/HOW_TO_WRITE_TEST.md diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/select_for_var_set.result.template b/system-test/Hartmut_tests/maxscale-mysqltest/r/select_for_var_set.result.template similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/select_for_var_set.result.template rename to system-test/Hartmut_tests/maxscale-mysqltest/r/select_for_var_set.result.template diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/set_autocommit_disabled.result b/system-test/Hartmut_tests/maxscale-mysqltest/r/set_autocommit_disabled.result similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/set_autocommit_disabled.result rename to system-test/Hartmut_tests/maxscale-mysqltest/r/set_autocommit_disabled.result diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_after_autocommit_disabled.result b/system-test/Hartmut_tests/maxscale-mysqltest/r/test_after_autocommit_disabled.result similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_after_autocommit_disabled.result rename to system-test/Hartmut_tests/maxscale-mysqltest/r/test_after_autocommit_disabled.result diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_autocommit_disabled1.result b/system-test/Hartmut_tests/maxscale-mysqltest/r/test_autocommit_disabled1.result similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_autocommit_disabled1.result rename to system-test/Hartmut_tests/maxscale-mysqltest/r/test_autocommit_disabled1.result diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_autocommit_disabled1b.result b/system-test/Hartmut_tests/maxscale-mysqltest/r/test_autocommit_disabled1b.result similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_autocommit_disabled1b.result rename to system-test/Hartmut_tests/maxscale-mysqltest/r/test_autocommit_disabled1b.result diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_autocommit_disabled2.result b/system-test/Hartmut_tests/maxscale-mysqltest/r/test_autocommit_disabled2.result similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_autocommit_disabled2.result rename to system-test/Hartmut_tests/maxscale-mysqltest/r/test_autocommit_disabled2.result diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_autocommit_disabled3.result b/system-test/Hartmut_tests/maxscale-mysqltest/r/test_autocommit_disabled3.result similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_autocommit_disabled3.result rename to system-test/Hartmut_tests/maxscale-mysqltest/r/test_autocommit_disabled3.result diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit1.result b/system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit1.result similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit1.result rename to system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit1.result diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit2.result b/system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit2.result similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit2.result rename to system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit2.result diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit3.result b/system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit3.result similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit3.result rename to system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit3.result diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit5.result b/system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit5.result similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit5.result rename to system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit5.result diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit6.result b/system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit6.result similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit6.result rename to system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit6.result diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit7.result b/system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit7.result similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit7.result rename to system-test/Hartmut_tests/maxscale-mysqltest/r/test_implicit_commit7.result diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_sescmd.result b/system-test/Hartmut_tests/maxscale-mysqltest/r/test_sescmd.result similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_sescmd.result rename to system-test/Hartmut_tests/maxscale-mysqltest/r/test_sescmd.result diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_transaction_routing2.result b/system-test/Hartmut_tests/maxscale-mysqltest/r/test_transaction_routing2.result similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_transaction_routing2.result rename to system-test/Hartmut_tests/maxscale-mysqltest/r/test_transaction_routing2.result diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_transaction_routing2b.result b/system-test/Hartmut_tests/maxscale-mysqltest/r/test_transaction_routing2b.result similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_transaction_routing2b.result rename to system-test/Hartmut_tests/maxscale-mysqltest/r/test_transaction_routing2b.result diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_transaction_routing4.result b/system-test/Hartmut_tests/maxscale-mysqltest/r/test_transaction_routing4.result similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_transaction_routing4.result rename to system-test/Hartmut_tests/maxscale-mysqltest/r/test_transaction_routing4.result diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_transaction_routing4b.result b/system-test/Hartmut_tests/maxscale-mysqltest/r/test_transaction_routing4b.result similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/r/test_transaction_routing4b.result rename to system-test/Hartmut_tests/maxscale-mysqltest/r/test_transaction_routing4b.result diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/sleep-1.inc b/system-test/Hartmut_tests/maxscale-mysqltest/sleep-1.inc similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/sleep-1.inc rename to system-test/Hartmut_tests/maxscale-mysqltest/sleep-1.inc diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/t/set_autocommit_disabled.test b/system-test/Hartmut_tests/maxscale-mysqltest/t/set_autocommit_disabled.test similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/t/set_autocommit_disabled.test rename to system-test/Hartmut_tests/maxscale-mysqltest/t/set_autocommit_disabled.test diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/t/test_after_autocommit_disabled.test b/system-test/Hartmut_tests/maxscale-mysqltest/t/test_after_autocommit_disabled.test similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/t/test_after_autocommit_disabled.test rename to system-test/Hartmut_tests/maxscale-mysqltest/t/test_after_autocommit_disabled.test diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/t/test_autocommit_disabled1.test b/system-test/Hartmut_tests/maxscale-mysqltest/t/test_autocommit_disabled1.test similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/t/test_autocommit_disabled1.test rename to system-test/Hartmut_tests/maxscale-mysqltest/t/test_autocommit_disabled1.test diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/t/test_autocommit_disabled1b.test b/system-test/Hartmut_tests/maxscale-mysqltest/t/test_autocommit_disabled1b.test similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/t/test_autocommit_disabled1b.test rename to system-test/Hartmut_tests/maxscale-mysqltest/t/test_autocommit_disabled1b.test diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/t/test_autocommit_disabled2.test b/system-test/Hartmut_tests/maxscale-mysqltest/t/test_autocommit_disabled2.test similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/t/test_autocommit_disabled2.test rename to system-test/Hartmut_tests/maxscale-mysqltest/t/test_autocommit_disabled2.test diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/t/test_autocommit_disabled3.test b/system-test/Hartmut_tests/maxscale-mysqltest/t/test_autocommit_disabled3.test similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/t/test_autocommit_disabled3.test rename to system-test/Hartmut_tests/maxscale-mysqltest/t/test_autocommit_disabled3.test diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/t/test_sescmd.test b/system-test/Hartmut_tests/maxscale-mysqltest/t/test_sescmd.test similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/t/test_sescmd.test rename to system-test/Hartmut_tests/maxscale-mysqltest/t/test_sescmd.test diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/t/test_transaction_routing2.test b/system-test/Hartmut_tests/maxscale-mysqltest/t/test_transaction_routing2.test similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/t/test_transaction_routing2.test rename to system-test/Hartmut_tests/maxscale-mysqltest/t/test_transaction_routing2.test diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/t/test_transaction_routing2b.test b/system-test/Hartmut_tests/maxscale-mysqltest/t/test_transaction_routing2b.test similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/t/test_transaction_routing2b.test rename to system-test/Hartmut_tests/maxscale-mysqltest/t/test_transaction_routing2b.test diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/t/test_transaction_routing4.test b/system-test/Hartmut_tests/maxscale-mysqltest/t/test_transaction_routing4.test similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/t/test_transaction_routing4.test rename to system-test/Hartmut_tests/maxscale-mysqltest/t/test_transaction_routing4.test diff --git a/maxscale-system-test/Hartmut_tests/maxscale-mysqltest/t/test_transaction_routing4b.test b/system-test/Hartmut_tests/maxscale-mysqltest/t/test_transaction_routing4b.test similarity index 100% rename from maxscale-system-test/Hartmut_tests/maxscale-mysqltest/t/test_transaction_routing4b.test rename to system-test/Hartmut_tests/maxscale-mysqltest/t/test_transaction_routing4b.test diff --git a/maxscale-system-test/JENKINS.md b/system-test/JENKINS.md similarity index 100% rename from maxscale-system-test/JENKINS.md rename to system-test/JENKINS.md diff --git a/maxscale-system-test/README b/system-test/README similarity index 100% rename from maxscale-system-test/README rename to system-test/README diff --git a/maxscale-system-test/README.md b/system-test/README.md similarity index 100% rename from maxscale-system-test/README.md rename to system-test/README.md diff --git a/maxscale-system-test/TEST_RUSULTS.md b/system-test/TEST_RUSULTS.md similarity index 100% rename from maxscale-system-test/TEST_RUSULTS.md rename to system-test/TEST_RUSULTS.md diff --git a/maxscale-system-test/alter_router.cpp b/system-test/alter_router.cpp similarity index 100% rename from maxscale-system-test/alter_router.cpp rename to system-test/alter_router.cpp diff --git a/maxscale-system-test/astylerc b/system-test/astylerc similarity index 100% rename from maxscale-system-test/astylerc rename to system-test/astylerc diff --git a/maxscale-system-test/auth_change_user_loop.cpp b/system-test/auth_change_user_loop.cpp similarity index 100% rename from maxscale-system-test/auth_change_user_loop.cpp rename to system-test/auth_change_user_loop.cpp diff --git a/maxscale-system-test/auth_enable_root.cpp b/system-test/auth_enable_root.cpp similarity index 100% rename from maxscale-system-test/auth_enable_root.cpp rename to system-test/auth_enable_root.cpp diff --git a/maxscale-system-test/auth_fail_crash.cpp b/system-test/auth_fail_crash.cpp similarity index 100% rename from maxscale-system-test/auth_fail_crash.cpp rename to system-test/auth_fail_crash.cpp diff --git a/maxscale-system-test/auth_hostname.cpp b/system-test/auth_hostname.cpp similarity index 100% rename from maxscale-system-test/auth_hostname.cpp rename to system-test/auth_hostname.cpp diff --git a/maxscale-system-test/auth_long_hostname.cpp b/system-test/auth_long_hostname.cpp similarity index 100% rename from maxscale-system-test/auth_long_hostname.cpp rename to system-test/auth_long_hostname.cpp diff --git a/maxscale-system-test/auth_old_pw.cpp b/system-test/auth_old_pw.cpp similarity index 100% rename from maxscale-system-test/auth_old_pw.cpp rename to system-test/auth_old_pw.cpp diff --git a/maxscale-system-test/auth_sqlmode_ansi.cpp b/system-test/auth_sqlmode_ansi.cpp similarity index 100% rename from maxscale-system-test/auth_sqlmode_ansi.cpp rename to system-test/auth_sqlmode_ansi.cpp diff --git a/maxscale-system-test/auth_users_from_master.cpp b/system-test/auth_users_from_master.cpp similarity index 100% rename from maxscale-system-test/auth_users_from_master.cpp rename to system-test/auth_users_from_master.cpp diff --git a/maxscale-system-test/auth_wchost.cpp b/system-test/auth_wchost.cpp similarity index 100% rename from maxscale-system-test/auth_wchost.cpp rename to system-test/auth_wchost.cpp diff --git a/maxscale-system-test/avro.cpp b/system-test/avro.cpp similarity index 100% rename from maxscale-system-test/avro.cpp rename to system-test/avro.cpp diff --git a/maxscale-system-test/avro_alter.cpp b/system-test/avro_alter.cpp similarity index 100% rename from maxscale-system-test/avro_alter.cpp rename to system-test/avro_alter.cpp diff --git a/maxscale-system-test/avro_long.cpp b/system-test/avro_long.cpp similarity index 100% rename from maxscale-system-test/avro_long.cpp rename to system-test/avro_long.cpp diff --git a/maxscale-system-test/backend_auth_fail.cpp b/system-test/backend_auth_fail.cpp similarity index 100% rename from maxscale-system-test/backend_auth_fail.cpp rename to system-test/backend_auth_fail.cpp diff --git a/maxscale-system-test/binary_ps.cpp b/system-test/binary_ps.cpp similarity index 100% rename from maxscale-system-test/binary_ps.cpp rename to system-test/binary_ps.cpp diff --git a/maxscale-system-test/binary_ps_cursor.cpp b/system-test/binary_ps_cursor.cpp similarity index 100% rename from maxscale-system-test/binary_ps_cursor.cpp rename to system-test/binary_ps_cursor.cpp diff --git a/maxscale-system-test/binlog_change_master.cpp b/system-test/binlog_change_master.cpp similarity index 100% rename from maxscale-system-test/binlog_change_master.cpp rename to system-test/binlog_change_master.cpp diff --git a/maxscale-system-test/binlog_change_master_common.cpp b/system-test/binlog_change_master_common.cpp similarity index 100% rename from maxscale-system-test/binlog_change_master_common.cpp rename to system-test/binlog_change_master_common.cpp diff --git a/maxscale-system-test/binlog_change_master_gtid.cpp b/system-test/binlog_change_master_gtid.cpp similarity index 100% rename from maxscale-system-test/binlog_change_master_gtid.cpp rename to system-test/binlog_change_master_gtid.cpp diff --git a/maxscale-system-test/binlog_enc_aes_cbc.cnf b/system-test/binlog_enc_aes_cbc.cnf similarity index 100% rename from maxscale-system-test/binlog_enc_aes_cbc.cnf rename to system-test/binlog_enc_aes_cbc.cnf diff --git a/maxscale-system-test/binlog_enc_aes_ctr.cnf b/system-test/binlog_enc_aes_ctr.cnf similarity index 100% rename from maxscale-system-test/binlog_enc_aes_ctr.cnf rename to system-test/binlog_enc_aes_ctr.cnf diff --git a/maxscale-system-test/binlog_incompl.cpp b/system-test/binlog_incompl.cpp similarity index 100% rename from maxscale-system-test/binlog_incompl.cpp rename to system-test/binlog_incompl.cpp diff --git a/maxscale-system-test/binlog_semisync.cpp b/system-test/binlog_semisync.cpp similarity index 100% rename from maxscale-system-test/binlog_semisync.cpp rename to system-test/binlog_semisync.cpp diff --git a/maxscale-system-test/bug562.sh b/system-test/bug562.sh similarity index 100% rename from maxscale-system-test/bug562.sh rename to system-test/bug562.sh diff --git a/maxscale-system-test/bug564.sh b/system-test/bug564.sh similarity index 100% rename from maxscale-system-test/bug564.sh rename to system-test/bug564.sh diff --git a/maxscale-system-test/bug567.sh b/system-test/bug567.sh similarity index 100% rename from maxscale-system-test/bug567.sh rename to system-test/bug567.sh diff --git a/maxscale-system-test/bug587.cpp b/system-test/bug587.cpp similarity index 100% rename from maxscale-system-test/bug587.cpp rename to system-test/bug587.cpp diff --git a/maxscale-system-test/bug670_sql.h b/system-test/bug670_sql.h similarity index 100% rename from maxscale-system-test/bug670_sql.h rename to system-test/bug670_sql.h diff --git a/maxscale-system-test/bug676.cpp b/system-test/bug676.cpp similarity index 100% rename from maxscale-system-test/bug676.cpp rename to system-test/bug676.cpp diff --git a/maxscale-system-test/bulk_insert.cpp b/system-test/bulk_insert.cpp similarity index 100% rename from maxscale-system-test/bulk_insert.cpp rename to system-test/bulk_insert.cpp diff --git a/maxscale-system-test/cache/cache_basic/cache_rules.json b/system-test/cache/cache_basic/cache_rules.json similarity index 100% rename from maxscale-system-test/cache/cache_basic/cache_rules.json rename to system-test/cache/cache_basic/cache_rules.json diff --git a/maxscale-system-test/cache/cache_basic/r/create.result b/system-test/cache/cache_basic/r/create.result similarity index 100% rename from maxscale-system-test/cache/cache_basic/r/create.result rename to system-test/cache/cache_basic/r/create.result diff --git a/maxscale-system-test/cache/cache_basic/r/delete.result b/system-test/cache/cache_basic/r/delete.result similarity index 100% rename from maxscale-system-test/cache/cache_basic/r/delete.result rename to system-test/cache/cache_basic/r/delete.result diff --git a/maxscale-system-test/cache/cache_basic/r/drop.result b/system-test/cache/cache_basic/r/drop.result similarity index 100% rename from maxscale-system-test/cache/cache_basic/r/drop.result rename to system-test/cache/cache_basic/r/drop.result diff --git a/maxscale-system-test/cache/cache_basic/r/insert1.result b/system-test/cache/cache_basic/r/insert1.result similarity index 100% rename from maxscale-system-test/cache/cache_basic/r/insert1.result rename to system-test/cache/cache_basic/r/insert1.result diff --git a/maxscale-system-test/cache/cache_basic/r/select0.result b/system-test/cache/cache_basic/r/select0.result similarity index 100% rename from maxscale-system-test/cache/cache_basic/r/select0.result rename to system-test/cache/cache_basic/r/select0.result diff --git a/maxscale-system-test/cache/cache_basic/r/select1.result b/system-test/cache/cache_basic/r/select1.result similarity index 100% rename from maxscale-system-test/cache/cache_basic/r/select1.result rename to system-test/cache/cache_basic/r/select1.result diff --git a/maxscale-system-test/cache/cache_basic/r/select2.result b/system-test/cache/cache_basic/r/select2.result similarity index 100% rename from maxscale-system-test/cache/cache_basic/r/select2.result rename to system-test/cache/cache_basic/r/select2.result diff --git a/maxscale-system-test/cache/cache_basic/r/select3.result b/system-test/cache/cache_basic/r/select3.result similarity index 100% rename from maxscale-system-test/cache/cache_basic/r/select3.result rename to system-test/cache/cache_basic/r/select3.result diff --git a/maxscale-system-test/cache/cache_basic/r/update1.result b/system-test/cache/cache_basic/r/update1.result similarity index 100% rename from maxscale-system-test/cache/cache_basic/r/update1.result rename to system-test/cache/cache_basic/r/update1.result diff --git a/maxscale-system-test/cache/cache_basic/r/update2.result b/system-test/cache/cache_basic/r/update2.result similarity index 100% rename from maxscale-system-test/cache/cache_basic/r/update2.result rename to system-test/cache/cache_basic/r/update2.result diff --git a/maxscale-system-test/cache/cache_basic/r/update3.result b/system-test/cache/cache_basic/r/update3.result similarity index 100% rename from maxscale-system-test/cache/cache_basic/r/update3.result rename to system-test/cache/cache_basic/r/update3.result diff --git a/maxscale-system-test/cache/cache_basic/t/create.test b/system-test/cache/cache_basic/t/create.test similarity index 100% rename from maxscale-system-test/cache/cache_basic/t/create.test rename to system-test/cache/cache_basic/t/create.test diff --git a/maxscale-system-test/cache/cache_basic/t/delete.test b/system-test/cache/cache_basic/t/delete.test similarity index 100% rename from maxscale-system-test/cache/cache_basic/t/delete.test rename to system-test/cache/cache_basic/t/delete.test diff --git a/maxscale-system-test/cache/cache_basic/t/drop.test b/system-test/cache/cache_basic/t/drop.test similarity index 100% rename from maxscale-system-test/cache/cache_basic/t/drop.test rename to system-test/cache/cache_basic/t/drop.test diff --git a/maxscale-system-test/cache/cache_basic/t/insert1.test b/system-test/cache/cache_basic/t/insert1.test similarity index 100% rename from maxscale-system-test/cache/cache_basic/t/insert1.test rename to system-test/cache/cache_basic/t/insert1.test diff --git a/maxscale-system-test/cache/cache_basic/t/select0.test b/system-test/cache/cache_basic/t/select0.test similarity index 100% rename from maxscale-system-test/cache/cache_basic/t/select0.test rename to system-test/cache/cache_basic/t/select0.test diff --git a/maxscale-system-test/cache/cache_basic/t/select1.test b/system-test/cache/cache_basic/t/select1.test similarity index 100% rename from maxscale-system-test/cache/cache_basic/t/select1.test rename to system-test/cache/cache_basic/t/select1.test diff --git a/maxscale-system-test/cache/cache_basic/t/select2.test b/system-test/cache/cache_basic/t/select2.test similarity index 100% rename from maxscale-system-test/cache/cache_basic/t/select2.test rename to system-test/cache/cache_basic/t/select2.test diff --git a/maxscale-system-test/cache/cache_basic/t/select3.test b/system-test/cache/cache_basic/t/select3.test similarity index 100% rename from maxscale-system-test/cache/cache_basic/t/select3.test rename to system-test/cache/cache_basic/t/select3.test diff --git a/maxscale-system-test/cache/cache_basic/t/update1.test b/system-test/cache/cache_basic/t/update1.test similarity index 100% rename from maxscale-system-test/cache/cache_basic/t/update1.test rename to system-test/cache/cache_basic/t/update1.test diff --git a/maxscale-system-test/cache/cache_basic/t/update2.test b/system-test/cache/cache_basic/t/update2.test similarity index 100% rename from maxscale-system-test/cache/cache_basic/t/update2.test rename to system-test/cache/cache_basic/t/update2.test diff --git a/maxscale-system-test/cache/cache_basic/t/update3.test b/system-test/cache/cache_basic/t/update3.test similarity index 100% rename from maxscale-system-test/cache/cache_basic/t/update3.test rename to system-test/cache/cache_basic/t/update3.test diff --git a/maxscale-system-test/cache_basic.sh b/system-test/cache_basic.sh similarity index 100% rename from maxscale-system-test/cache_basic.sh rename to system-test/cache_basic.sh diff --git a/maxscale-system-test/cache_runtime.cpp b/system-test/cache_runtime.cpp similarity index 100% rename from maxscale-system-test/cache_runtime.cpp rename to system-test/cache_runtime.cpp diff --git a/maxscale-system-test/cache_runtime_ttl.cpp b/system-test/cache_runtime_ttl.cpp similarity index 100% rename from maxscale-system-test/cache_runtime_ttl.cpp rename to system-test/cache_runtime_ttl.cpp diff --git a/maxscale-system-test/ccrfilter.cpp b/system-test/ccrfilter.cpp similarity index 100% rename from maxscale-system-test/ccrfilter.cpp rename to system-test/ccrfilter.cpp diff --git a/maxscale-system-test/cdc_client.cpp b/system-test/cdc_client.cpp similarity index 100% rename from maxscale-system-test/cdc_client.cpp rename to system-test/cdc_client.cpp diff --git a/maxscale-system-test/cdc_datatypes/CMakeLists.txt b/system-test/cdc_datatypes/CMakeLists.txt similarity index 100% rename from maxscale-system-test/cdc_datatypes/CMakeLists.txt rename to system-test/cdc_datatypes/CMakeLists.txt diff --git a/maxscale-system-test/cdc_datatypes/cdc_datatypes.cpp b/system-test/cdc_datatypes/cdc_datatypes.cpp similarity index 100% rename from maxscale-system-test/cdc_datatypes/cdc_datatypes.cpp rename to system-test/cdc_datatypes/cdc_datatypes.cpp diff --git a/maxscale-system-test/cdc_datatypes/cdc_result.cpp b/system-test/cdc_datatypes/cdc_result.cpp similarity index 100% rename from maxscale-system-test/cdc_datatypes/cdc_result.cpp rename to system-test/cdc_datatypes/cdc_result.cpp diff --git a/maxscale-system-test/cdc_datatypes/cdc_result.h b/system-test/cdc_datatypes/cdc_result.h similarity index 100% rename from maxscale-system-test/cdc_datatypes/cdc_result.h rename to system-test/cdc_datatypes/cdc_result.h diff --git a/maxscale-system-test/change_master.cpp b/system-test/change_master.cpp similarity index 100% rename from maxscale-system-test/change_master.cpp rename to system-test/change_master.cpp diff --git a/maxscale-system-test/change_master_during_session.cpp b/system-test/change_master_during_session.cpp similarity index 100% rename from maxscale-system-test/change_master_during_session.cpp rename to system-test/change_master_during_session.cpp diff --git a/maxscale-system-test/change_user.cpp b/system-test/change_user.cpp similarity index 100% rename from maxscale-system-test/change_user.cpp rename to system-test/change_user.cpp diff --git a/maxscale-system-test/check_backend.cpp b/system-test/check_backend.cpp similarity index 100% rename from maxscale-system-test/check_backend.cpp rename to system-test/check_backend.cpp diff --git a/maxscale-system-test/cmake/BuildJansson.cmake b/system-test/cmake/BuildJansson.cmake similarity index 100% rename from maxscale-system-test/cmake/BuildJansson.cmake rename to system-test/cmake/BuildJansson.cmake diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.add_server b/system-test/cnf/maxscale.cnf.template.add_server similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.add_server rename to system-test/cnf/maxscale.cnf.template.add_server diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.add_service b/system-test/cnf/maxscale.cnf.template.add_service similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.add_service rename to system-test/cnf/maxscale.cnf.template.add_service diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.alter_router b/system-test/cnf/maxscale.cnf.template.alter_router similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.alter_router rename to system-test/cnf/maxscale.cnf.template.alter_router diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.auroramon b/system-test/cnf/maxscale.cnf.template.auroramon similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.auroramon rename to system-test/cnf/maxscale.cnf.template.auroramon diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.auth_change_user_loop b/system-test/cnf/maxscale.cnf.template.auth_change_user_loop similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.auth_change_user_loop rename to system-test/cnf/maxscale.cnf.template.auth_change_user_loop diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.auth_enable_root b/system-test/cnf/maxscale.cnf.template.auth_enable_root similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.auth_enable_root rename to system-test/cnf/maxscale.cnf.template.auth_enable_root diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.auth_sqlmode_ansi b/system-test/cnf/maxscale.cnf.template.auth_sqlmode_ansi similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.auth_sqlmode_ansi rename to system-test/cnf/maxscale.cnf.template.auth_sqlmode_ansi diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.avro b/system-test/cnf/maxscale.cnf.template.avro similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.avro rename to system-test/cnf/maxscale.cnf.template.avro diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.avro_compression b/system-test/cnf/maxscale.cnf.template.avro_compression similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.avro_compression rename to system-test/cnf/maxscale.cnf.template.avro_compression diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bad_pers b/system-test/cnf/maxscale.cnf.template.bad_pers similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bad_pers rename to system-test/cnf/maxscale.cnf.template.bad_pers diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bad_ssl b/system-test/cnf/maxscale.cnf.template.bad_ssl similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bad_ssl rename to system-test/cnf/maxscale.cnf.template.bad_ssl diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.batchinsert b/system-test/cnf/maxscale.cnf.template.batchinsert similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.batchinsert rename to system-test/cnf/maxscale.cnf.template.batchinsert diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.binlog_enc_aes_cbc b/system-test/cnf/maxscale.cnf.template.binlog_enc_aes_cbc similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.binlog_enc_aes_cbc rename to system-test/cnf/maxscale.cnf.template.binlog_enc_aes_cbc diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.binlog_enc_aes_ctr b/system-test/cnf/maxscale.cnf.template.binlog_enc_aes_ctr similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.binlog_enc_aes_ctr rename to system-test/cnf/maxscale.cnf.template.binlog_enc_aes_ctr diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.binlog_incompl b/system-test/cnf/maxscale.cnf.template.binlog_incompl similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.binlog_incompl rename to system-test/cnf/maxscale.cnf.template.binlog_incompl diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug359 b/system-test/cnf/maxscale.cnf.template.bug359 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug359 rename to system-test/cnf/maxscale.cnf.template.bug359 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug471_big b/system-test/cnf/maxscale.cnf.template.bug471_big similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug471_big rename to system-test/cnf/maxscale.cnf.template.bug471_big diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug479 b/system-test/cnf/maxscale.cnf.template.bug479 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug479 rename to system-test/cnf/maxscale.cnf.template.bug479 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug493 b/system-test/cnf/maxscale.cnf.template.bug493 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug493 rename to system-test/cnf/maxscale.cnf.template.bug493 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug495 b/system-test/cnf/maxscale.cnf.template.bug495 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug495 rename to system-test/cnf/maxscale.cnf.template.bug495 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug526 b/system-test/cnf/maxscale.cnf.template.bug526 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug526 rename to system-test/cnf/maxscale.cnf.template.bug526 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug539 b/system-test/cnf/maxscale.cnf.template.bug539 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug539 rename to system-test/cnf/maxscale.cnf.template.bug539 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug547 b/system-test/cnf/maxscale.cnf.template.bug547 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug547 rename to system-test/cnf/maxscale.cnf.template.bug547 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug567 b/system-test/cnf/maxscale.cnf.template.bug567 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug567 rename to system-test/cnf/maxscale.cnf.template.bug567 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug585 b/system-test/cnf/maxscale.cnf.template.bug585 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug585 rename to system-test/cnf/maxscale.cnf.template.bug585 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug587 b/system-test/cnf/maxscale.cnf.template.bug587 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug587 rename to system-test/cnf/maxscale.cnf.template.bug587 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug587_1 b/system-test/cnf/maxscale.cnf.template.bug587_1 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug587_1 rename to system-test/cnf/maxscale.cnf.template.bug587_1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug643 b/system-test/cnf/maxscale.cnf.template.bug643 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug643 rename to system-test/cnf/maxscale.cnf.template.bug643 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug643_1 b/system-test/cnf/maxscale.cnf.template.bug643_1 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug643_1 rename to system-test/cnf/maxscale.cnf.template.bug643_1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug645 b/system-test/cnf/maxscale.cnf.template.bug645 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug645 rename to system-test/cnf/maxscale.cnf.template.bug645 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug645_1 b/system-test/cnf/maxscale.cnf.template.bug645_1 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug645_1 rename to system-test/cnf/maxscale.cnf.template.bug645_1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug648 b/system-test/cnf/maxscale.cnf.template.bug648 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug648 rename to system-test/cnf/maxscale.cnf.template.bug648 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug650 b/system-test/cnf/maxscale.cnf.template.bug650 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug650 rename to system-test/cnf/maxscale.cnf.template.bug650 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug657 b/system-test/cnf/maxscale.cnf.template.bug657 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug657 rename to system-test/cnf/maxscale.cnf.template.bug657 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug670 b/system-test/cnf/maxscale.cnf.template.bug670 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug670 rename to system-test/cnf/maxscale.cnf.template.bug670 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug718 b/system-test/cnf/maxscale.cnf.template.bug718 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bug718 rename to system-test/cnf/maxscale.cnf.template.bug718 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bulk_insert b/system-test/cnf/maxscale.cnf.template.bulk_insert similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.bulk_insert rename to system-test/cnf/maxscale.cnf.template.bulk_insert diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.cache_basic b/system-test/cnf/maxscale.cnf.template.cache_basic similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.cache_basic rename to system-test/cnf/maxscale.cnf.template.cache_basic diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.cache_runtime b/system-test/cnf/maxscale.cnf.template.cache_runtime similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.cache_runtime rename to system-test/cnf/maxscale.cnf.template.cache_runtime diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.cache_runtime_ttl b/system-test/cnf/maxscale.cnf.template.cache_runtime_ttl similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.cache_runtime_ttl rename to system-test/cnf/maxscale.cnf.template.cache_runtime_ttl diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.ccrfilter b/system-test/cnf/maxscale.cnf.template.ccrfilter similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.ccrfilter rename to system-test/cnf/maxscale.cnf.template.ccrfilter diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.check_backend b/system-test/cnf/maxscale.cnf.template.check_backend similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.check_backend rename to system-test/cnf/maxscale.cnf.template.check_backend diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.config_reload b/system-test/cnf/maxscale.cnf.template.config_reload similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.config_reload rename to system-test/cnf/maxscale.cnf.template.config_reload diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.connection_limit b/system-test/cnf/maxscale.cnf.template.connection_limit similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.connection_limit rename to system-test/cnf/maxscale.cnf.template.connection_limit diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.crash_on_bad_sescmd b/system-test/cnf/maxscale.cnf.template.crash_on_bad_sescmd similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.crash_on_bad_sescmd rename to system-test/cnf/maxscale.cnf.template.crash_on_bad_sescmd diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.csmon_test b/system-test/cnf/maxscale.cnf.template.csmon_test similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.csmon_test rename to system-test/cnf/maxscale.cnf.template.csmon_test diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.fwf b/system-test/cnf/maxscale.cnf.template.fwf similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.fwf rename to system-test/cnf/maxscale.cnf.template.fwf diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.fwf_action b/system-test/cnf/maxscale.cnf.template.fwf_action similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.fwf_action rename to system-test/cnf/maxscale.cnf.template.fwf_action diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.fwf_com_ping b/system-test/cnf/maxscale.cnf.template.fwf_com_ping similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.fwf_com_ping rename to system-test/cnf/maxscale.cnf.template.fwf_com_ping diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.fwf_logging b/system-test/cnf/maxscale.cnf.template.fwf_logging similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.fwf_logging rename to system-test/cnf/maxscale.cnf.template.fwf_logging diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.fwf_syntax b/system-test/cnf/maxscale.cnf.template.fwf_syntax similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.fwf_syntax rename to system-test/cnf/maxscale.cnf.template.fwf_syntax diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera b/system-test/cnf/maxscale.cnf.template.galera similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.galera rename to system-test/cnf/maxscale.cnf.template.galera diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera_hartmut b/system-test/cnf/maxscale.cnf.template.galera_hartmut similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.galera_hartmut rename to system-test/cnf/maxscale.cnf.template.galera_hartmut diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera_mxs564 b/system-test/cnf/maxscale.cnf.template.galera_mxs564 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.galera_mxs564 rename to system-test/cnf/maxscale.cnf.template.galera_mxs564 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera_priority b/system-test/cnf/maxscale.cnf.template.galera_priority similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.galera_priority rename to system-test/cnf/maxscale.cnf.template.galera_priority diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.gatekeeper b/system-test/cnf/maxscale.cnf.template.gatekeeper similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.gatekeeper rename to system-test/cnf/maxscale.cnf.template.gatekeeper diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.hartmut b/system-test/cnf/maxscale.cnf.template.hartmut similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.hartmut rename to system-test/cnf/maxscale.cnf.template.hartmut diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.hints b/system-test/cnf/maxscale.cnf.template.hints similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.hints rename to system-test/cnf/maxscale.cnf.template.hints diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.hints2 b/system-test/cnf/maxscale.cnf.template.hints2 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.hints2 rename to system-test/cnf/maxscale.cnf.template.hints2 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.insertstream b/system-test/cnf/maxscale.cnf.template.insertstream similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.insertstream rename to system-test/cnf/maxscale.cnf.template.insertstream diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt b/system-test/cnf/maxscale.cnf.template.java_prep_stmt similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt rename to system-test/cnf/maxscale.cnf.template.java_prep_stmt diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.000 b/system-test/cnf/maxscale.cnf.template.keepalived.000 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.keepalived.000 rename to system-test/cnf/maxscale.cnf.template.keepalived.000 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.001 b/system-test/cnf/maxscale.cnf.template.keepalived.001 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.keepalived.001 rename to system-test/cnf/maxscale.cnf.template.keepalived.001 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.000 b/system-test/cnf/maxscale.cnf.template.keepalived_masterdown.000 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.000 rename to system-test/cnf/maxscale.cnf.template.keepalived_masterdown.000 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.001 b/system-test/cnf/maxscale.cnf.template.keepalived_masterdown.001 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.001 rename to system-test/cnf/maxscale.cnf.template.keepalived_masterdown.001 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.kerberos b/system-test/cnf/maxscale.cnf.template.kerberos similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.kerberos rename to system-test/cnf/maxscale.cnf.template.kerberos diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.kerberos_ssl b/system-test/cnf/maxscale.cnf.template.kerberos_ssl similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.kerberos_ssl rename to system-test/cnf/maxscale.cnf.template.kerberos_ssl diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.lag b/system-test/cnf/maxscale.cnf.template.lag similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.lag rename to system-test/cnf/maxscale.cnf.template.lag diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load b/system-test/cnf/maxscale.cnf.template.load similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.load rename to system-test/cnf/maxscale.cnf.template.load diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera b/system-test/cnf/maxscale.cnf.template.load_galera similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.load_galera rename to system-test/cnf/maxscale.cnf.template.load_galera diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1 b/system-test/cnf/maxscale.cnf.template.load_galera_pers1 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1 rename to system-test/cnf/maxscale.cnf.template.load_galera_pers1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10 b/system-test/cnf/maxscale.cnf.template.load_galera_pers10 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10 rename to system-test/cnf/maxscale.cnf.template.load_galera_pers10 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_pers1 b/system-test/cnf/maxscale.cnf.template.load_pers1 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.load_pers1 rename to system-test/cnf/maxscale.cnf.template.load_pers1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_pers10 b/system-test/cnf/maxscale.cnf.template.load_pers10 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.load_pers10 rename to system-test/cnf/maxscale.cnf.template.load_pers10 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.local_address b/system-test/cnf/maxscale.cnf.template.local_address similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.local_address rename to system-test/cnf/maxscale.cnf.template.local_address diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.longblob b/system-test/cnf/maxscale.cnf.template.longblob similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.longblob rename to system-test/cnf/maxscale.cnf.template.longblob diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.longblob_filters b/system-test/cnf/maxscale.cnf.template.longblob_filters similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.longblob_filters rename to system-test/cnf/maxscale.cnf.template.longblob_filters diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.masking_auto_firewall b/system-test/cnf/maxscale.cnf.template.masking_auto_firewall similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.masking_auto_firewall rename to system-test/cnf/maxscale.cnf.template.masking_auto_firewall diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.masking_mysqltest b/system-test/cnf/maxscale.cnf.template.masking_mysqltest similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.masking_mysqltest rename to system-test/cnf/maxscale.cnf.template.masking_mysqltest diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.master_only b/system-test/cnf/maxscale.cnf.template.master_only similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.master_only rename to system-test/cnf/maxscale.cnf.template.master_only diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.maxadmin_show_users_crash b/system-test/cnf/maxscale.cnf.template.maxadmin_show_users_crash similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.maxadmin_show_users_crash rename to system-test/cnf/maxscale.cnf.template.maxadmin_show_users_crash diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.maxctrl b/system-test/cnf/maxscale.cnf.template.maxctrl similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.maxctrl rename to system-test/cnf/maxscale.cnf.template.maxctrl diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.maxctrl_basic b/system-test/cnf/maxscale.cnf.template.maxctrl_basic similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.maxctrl_basic rename to system-test/cnf/maxscale.cnf.template.maxctrl_basic diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.maxinfo b/system-test/cnf/maxscale.cnf.template.maxinfo similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.maxinfo rename to system-test/cnf/maxscale.cnf.template.maxinfo diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.maxinfo_sql b/system-test/cnf/maxscale.cnf.template.maxinfo_sql similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.maxinfo_sql rename to system-test/cnf/maxscale.cnf.template.maxinfo_sql diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.maxpasswd b/system-test/cnf/maxscale.cnf.template.maxpasswd similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.maxpasswd rename to system-test/cnf/maxscale.cnf.template.maxpasswd diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.maxrows b/system-test/cnf/maxscale.cnf.template.maxrows similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.maxrows rename to system-test/cnf/maxscale.cnf.template.maxrows diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mm b/system-test/cnf/maxscale.cnf.template.mm similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mm rename to system-test/cnf/maxscale.cnf.template.mm diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1045 b/system-test/cnf/maxscale.cnf.template.mxs1045 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1045 rename to system-test/cnf/maxscale.cnf.template.mxs1045 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1113_schemarouter_ps b/system-test/cnf/maxscale.cnf.template.mxs1113_schemarouter_ps similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1113_schemarouter_ps rename to system-test/cnf/maxscale.cnf.template.mxs1113_schemarouter_ps diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1123 b/system-test/cnf/maxscale.cnf.template.mxs1123 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1123 rename to system-test/cnf/maxscale.cnf.template.mxs1123 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs118 b/system-test/cnf/maxscale.cnf.template.mxs118 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs118 rename to system-test/cnf/maxscale.cnf.template.mxs118 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1295 b/system-test/cnf/maxscale.cnf.template.mxs1295 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1295 rename to system-test/cnf/maxscale.cnf.template.mxs1295 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1310_implicit_db b/system-test/cnf/maxscale.cnf.template.mxs1310_implicit_db similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1310_implicit_db rename to system-test/cnf/maxscale.cnf.template.mxs1310_implicit_db diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1323 b/system-test/cnf/maxscale.cnf.template.mxs1323 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1323 rename to system-test/cnf/maxscale.cnf.template.mxs1323 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1451_skip_auth b/system-test/cnf/maxscale.cnf.template.mxs1451_skip_auth similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1451_skip_auth rename to system-test/cnf/maxscale.cnf.template.mxs1451_skip_auth diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1457_ignore_deleted b/system-test/cnf/maxscale.cnf.template.mxs1457_ignore_deleted similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1457_ignore_deleted rename to system-test/cnf/maxscale.cnf.template.mxs1457_ignore_deleted diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1468 b/system-test/cnf/maxscale.cnf.template.mxs1468 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1468 rename to system-test/cnf/maxscale.cnf.template.mxs1468 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1476 b/system-test/cnf/maxscale.cnf.template.mxs1476 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1476 rename to system-test/cnf/maxscale.cnf.template.mxs1476 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1503_extra_slaves b/system-test/cnf/maxscale.cnf.template.mxs1503_extra_slaves similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1503_extra_slaves rename to system-test/cnf/maxscale.cnf.template.mxs1503_extra_slaves diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1503_master_reconnection b/system-test/cnf/maxscale.cnf.template.mxs1503_master_reconnection similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1503_master_reconnection rename to system-test/cnf/maxscale.cnf.template.mxs1503_master_reconnection diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1506_delayed_retry b/system-test/cnf/maxscale.cnf.template.mxs1506_delayed_retry similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1506_delayed_retry rename to system-test/cnf/maxscale.cnf.template.mxs1506_delayed_retry diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1507_trx_replay b/system-test/cnf/maxscale.cnf.template.mxs1507_trx_replay similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1507_trx_replay rename to system-test/cnf/maxscale.cnf.template.mxs1507_trx_replay diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1507_trx_stress b/system-test/cnf/maxscale.cnf.template.mxs1507_trx_stress similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1507_trx_stress rename to system-test/cnf/maxscale.cnf.template.mxs1507_trx_stress diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1509 b/system-test/cnf/maxscale.cnf.template.mxs1509 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1509 rename to system-test/cnf/maxscale.cnf.template.mxs1509 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1549_optimistic_trx b/system-test/cnf/maxscale.cnf.template.mxs1549_optimistic_trx similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1549_optimistic_trx rename to system-test/cnf/maxscale.cnf.template.mxs1549_optimistic_trx diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1583_fwf b/system-test/cnf/maxscale.cnf.template.mxs1583_fwf similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1583_fwf rename to system-test/cnf/maxscale.cnf.template.mxs1583_fwf diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1585 b/system-test/cnf/maxscale.cnf.template.mxs1585 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1585 rename to system-test/cnf/maxscale.cnf.template.mxs1585 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1643_extra_events b/system-test/cnf/maxscale.cnf.template.mxs1643_extra_events similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1643_extra_events rename to system-test/cnf/maxscale.cnf.template.mxs1643_extra_events diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1713_lots_of_databases b/system-test/cnf/maxscale.cnf.template.mxs1713_lots_of_databases similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1713_lots_of_databases rename to system-test/cnf/maxscale.cnf.template.mxs1713_lots_of_databases diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1719 b/system-test/cnf/maxscale.cnf.template.mxs1719 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1719 rename to system-test/cnf/maxscale.cnf.template.mxs1719 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1731_empty_param b/system-test/cnf/maxscale.cnf.template.mxs1731_empty_param similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1731_empty_param rename to system-test/cnf/maxscale.cnf.template.mxs1731_empty_param diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs173_throttle_filter b/system-test/cnf/maxscale.cnf.template.mxs173_throttle_filter similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs173_throttle_filter rename to system-test/cnf/maxscale.cnf.template.mxs173_throttle_filter diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1743_rconn_bitmask b/system-test/cnf/maxscale.cnf.template.mxs1743_rconn_bitmask similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1743_rconn_bitmask rename to system-test/cnf/maxscale.cnf.template.mxs1743_rconn_bitmask diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1751_available_when_donor_crash b/system-test/cnf/maxscale.cnf.template.mxs1751_available_when_donor_crash similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1751_available_when_donor_crash rename to system-test/cnf/maxscale.cnf.template.mxs1751_available_when_donor_crash diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1760_use_sql_variables_in b/system-test/cnf/maxscale.cnf.template.mxs1760_use_sql_variables_in similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1760_use_sql_variables_in rename to system-test/cnf/maxscale.cnf.template.mxs1760_use_sql_variables_in diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1778_causal_reads b/system-test/cnf/maxscale.cnf.template.mxs1778_causal_reads similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1778_causal_reads rename to system-test/cnf/maxscale.cnf.template.mxs1778_causal_reads diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1836_show_eventTimes b/system-test/cnf/maxscale.cnf.template.mxs1836_show_eventTimes similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1836_show_eventTimes rename to system-test/cnf/maxscale.cnf.template.mxs1836_show_eventTimes diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1849_table_sharding b/system-test/cnf/maxscale.cnf.template.mxs1849_table_sharding similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1849_table_sharding rename to system-test/cnf/maxscale.cnf.template.mxs1849_table_sharding diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1889 b/system-test/cnf/maxscale.cnf.template.mxs1889 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1889 rename to system-test/cnf/maxscale.cnf.template.mxs1889 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1926_killed_server b/system-test/cnf/maxscale.cnf.template.mxs1926_killed_server similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1926_killed_server rename to system-test/cnf/maxscale.cnf.template.mxs1926_killed_server diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1929_filter_runtime b/system-test/cnf/maxscale.cnf.template.mxs1929_filter_runtime similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1929_filter_runtime rename to system-test/cnf/maxscale.cnf.template.mxs1929_filter_runtime diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1929_service_runtime b/system-test/cnf/maxscale.cnf.template.mxs1929_service_runtime similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1929_service_runtime rename to system-test/cnf/maxscale.cnf.template.mxs1929_service_runtime diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1929_start_from_scratch b/system-test/cnf/maxscale.cnf.template.mxs1929_start_from_scratch similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1929_start_from_scratch rename to system-test/cnf/maxscale.cnf.template.mxs1929_start_from_scratch diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1961_standalone_rejoin b/system-test/cnf/maxscale.cnf.template.mxs1961_standalone_rejoin similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1961_standalone_rejoin rename to system-test/cnf/maxscale.cnf.template.mxs1961_standalone_rejoin diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1980_blr_galera_server_ids b/system-test/cnf/maxscale.cnf.template.mxs1980_blr_galera_server_ids similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs1980_blr_galera_server_ids rename to system-test/cnf/maxscale.cnf.template.mxs1980_blr_galera_server_ids diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2037_namedserver_wildcards b/system-test/cnf/maxscale.cnf.template.mxs2037_namedserver_wildcards similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs2037_namedserver_wildcards rename to system-test/cnf/maxscale.cnf.template.mxs2037_namedserver_wildcards diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2047_blr_gtid_path b/system-test/cnf/maxscale.cnf.template.mxs2047_blr_gtid_path similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs2047_blr_gtid_path rename to system-test/cnf/maxscale.cnf.template.mxs2047_blr_gtid_path diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2054_hybrid_cluster b/system-test/cnf/maxscale.cnf.template.mxs2054_hybrid_cluster similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs2054_hybrid_cluster rename to system-test/cnf/maxscale.cnf.template.mxs2054_hybrid_cluster diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2057_systemd_watchdog b/system-test/cnf/maxscale.cnf.template.mxs2057_systemd_watchdog similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs2057_systemd_watchdog rename to system-test/cnf/maxscale.cnf.template.mxs2057_systemd_watchdog diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2167_extra_port b/system-test/cnf/maxscale.cnf.template.mxs2167_extra_port similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs2167_extra_port rename to system-test/cnf/maxscale.cnf.template.mxs2167_extra_port diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2187_multi_replay b/system-test/cnf/maxscale.cnf.template.mxs2187_multi_replay similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs2187_multi_replay rename to system-test/cnf/maxscale.cnf.template.mxs2187_multi_replay diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2250_describe_temp_table b/system-test/cnf/maxscale.cnf.template.mxs2250_describe_temp_table similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs2250_describe_temp_table rename to system-test/cnf/maxscale.cnf.template.mxs2250_describe_temp_table diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2295_change_user_loop b/system-test/cnf/maxscale.cnf.template.mxs2295_change_user_loop similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs2295_change_user_loop rename to system-test/cnf/maxscale.cnf.template.mxs2295_change_user_loop diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2300_history_pruning b/system-test/cnf/maxscale.cnf.template.mxs2300_history_pruning similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs2300_history_pruning rename to system-test/cnf/maxscale.cnf.template.mxs2300_history_pruning diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2326_hint_clone b/system-test/cnf/maxscale.cnf.template.mxs2326_hint_clone similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs2326_hint_clone rename to system-test/cnf/maxscale.cnf.template.mxs2326_hint_clone diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2417_ignore_persisted_cnf b/system-test/cnf/maxscale.cnf.template.mxs2417_ignore_persisted_cnf similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs2417_ignore_persisted_cnf rename to system-test/cnf/maxscale.cnf.template.mxs2417_ignore_persisted_cnf diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2450_change_user_crash b/system-test/cnf/maxscale.cnf.template.mxs2450_change_user_crash similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs2450_change_user_crash rename to system-test/cnf/maxscale.cnf.template.mxs2450_change_user_crash diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2464_sescmd_reconnect b/system-test/cnf/maxscale.cnf.template.mxs2464_sescmd_reconnect similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs2464_sescmd_reconnect rename to system-test/cnf/maxscale.cnf.template.mxs2464_sescmd_reconnect diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2520_master_read_reconnect b/system-test/cnf/maxscale.cnf.template.mxs2520_master_read_reconnect similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs2520_master_read_reconnect rename to system-test/cnf/maxscale.cnf.template.mxs2520_master_read_reconnect diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2521_double_exec b/system-test/cnf/maxscale.cnf.template.mxs2521_double_exec similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs2521_double_exec rename to system-test/cnf/maxscale.cnf.template.mxs2521_double_exec diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2563_concurrent_slave_failure b/system-test/cnf/maxscale.cnf.template.mxs2563_concurrent_slave_failure similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs2563_concurrent_slave_failure rename to system-test/cnf/maxscale.cnf.template.mxs2563_concurrent_slave_failure diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2609_history_replay b/system-test/cnf/maxscale.cnf.template.mxs2609_history_replay similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs2609_history_replay rename to system-test/cnf/maxscale.cnf.template.mxs2609_history_replay diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2621_lower_case_tables b/system-test/cnf/maxscale.cnf.template.mxs2621_lower_case_tables similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs2621_lower_case_tables rename to system-test/cnf/maxscale.cnf.template.mxs2621_lower_case_tables diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2631_ignore_system_tables b/system-test/cnf/maxscale.cnf.template.mxs2631_ignore_system_tables similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs2631_ignore_system_tables rename to system-test/cnf/maxscale.cnf.template.mxs2631_ignore_system_tables diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs2878_monitor_ssl b/system-test/cnf/maxscale.cnf.template.mxs2878_monitor_ssl similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs2878_monitor_ssl rename to system-test/cnf/maxscale.cnf.template.mxs2878_monitor_ssl diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs359_error_on_write b/system-test/cnf/maxscale.cnf.template.mxs359_error_on_write similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs359_error_on_write rename to system-test/cnf/maxscale.cnf.template.mxs359_error_on_write diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs359_master_switch b/system-test/cnf/maxscale.cnf.template.mxs359_master_switch similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs359_master_switch rename to system-test/cnf/maxscale.cnf.template.mxs359_master_switch diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs359_read_only b/system-test/cnf/maxscale.cnf.template.mxs359_read_only similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs359_read_only rename to system-test/cnf/maxscale.cnf.template.mxs359_read_only diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs361 b/system-test/cnf/maxscale.cnf.template.mxs361 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs361 rename to system-test/cnf/maxscale.cnf.template.mxs361 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs421_events b/system-test/cnf/maxscale.cnf.template.mxs421_events similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs421_events rename to system-test/cnf/maxscale.cnf.template.mxs421_events diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs501 b/system-test/cnf/maxscale.cnf.template.mxs501 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs501 rename to system-test/cnf/maxscale.cnf.template.mxs501 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs548 b/system-test/cnf/maxscale.cnf.template.mxs548 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs548 rename to system-test/cnf/maxscale.cnf.template.mxs548 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs559 b/system-test/cnf/maxscale.cnf.template.mxs559 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs559 rename to system-test/cnf/maxscale.cnf.template.mxs559 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs701_binlog_filter b/system-test/cnf/maxscale.cnf.template.mxs701_binlog_filter similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs701_binlog_filter rename to system-test/cnf/maxscale.cnf.template.mxs701_binlog_filter diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs710_bad_socket b/system-test/cnf/maxscale.cnf.template.mxs710_bad_socket similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs710_bad_socket rename to system-test/cnf/maxscale.cnf.template.mxs710_bad_socket diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs711_two_ports b/system-test/cnf/maxscale.cnf.template.mxs711_two_ports similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs711_two_ports rename to system-test/cnf/maxscale.cnf.template.mxs711_two_ports diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs720_line_with_no_equal b/system-test/cnf/maxscale.cnf.template.mxs720_line_with_no_equal similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs720_line_with_no_equal rename to system-test/cnf/maxscale.cnf.template.mxs720_line_with_no_equal diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs720_wierd_line b/system-test/cnf/maxscale.cnf.template.mxs720_wierd_line similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs720_wierd_line rename to system-test/cnf/maxscale.cnf.template.mxs720_wierd_line diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs722 b/system-test/cnf/maxscale.cnf.template.mxs722 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs722 rename to system-test/cnf/maxscale.cnf.template.mxs722 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs799 b/system-test/cnf/maxscale.cnf.template.mxs799 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs799 rename to system-test/cnf/maxscale.cnf.template.mxs799 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs827_write_timeout b/system-test/cnf/maxscale.cnf.template.mxs827_write_timeout similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs827_write_timeout rename to system-test/cnf/maxscale.cnf.template.mxs827_write_timeout diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs874 b/system-test/cnf/maxscale.cnf.template.mxs874 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs874 rename to system-test/cnf/maxscale.cnf.template.mxs874 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs922 b/system-test/cnf/maxscale.cnf.template.mxs922 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs922 rename to system-test/cnf/maxscale.cnf.template.mxs922 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs922_base b/system-test/cnf/maxscale.cnf.template.mxs922_base similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mxs922_base rename to system-test/cnf/maxscale.cnf.template.mxs922_base diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_backup b/system-test/cnf/maxscale.cnf.template.mysqlmon_backup similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_backup rename to system-test/cnf/maxscale.cnf.template.mysqlmon_backup diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.namedserverfilter b/system-test/cnf/maxscale.cnf.template.namedserverfilter similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.namedserverfilter rename to system-test/cnf/maxscale.cnf.template.namedserverfilter diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.nsfilter b/system-test/cnf/maxscale.cnf.template.nsfilter similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.nsfilter rename to system-test/cnf/maxscale.cnf.template.nsfilter diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.old_passwd b/system-test/cnf/maxscale.cnf.template.old_passwd similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.old_passwd rename to system-test/cnf/maxscale.cnf.template.old_passwd diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.open_close b/system-test/cnf/maxscale.cnf.template.open_close similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.open_close rename to system-test/cnf/maxscale.cnf.template.open_close diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.pam_authentication b/system-test/cnf/maxscale.cnf.template.pam_authentication similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.pam_authentication rename to system-test/cnf/maxscale.cnf.template.pam_authentication diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.pers_01 b/system-test/cnf/maxscale.cnf.template.pers_01 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.pers_01 rename to system-test/cnf/maxscale.cnf.template.pers_01 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.proxy_protocol b/system-test/cnf/maxscale.cnf.template.proxy_protocol similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.proxy_protocol rename to system-test/cnf/maxscale.cnf.template.proxy_protocol diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.regexf_replace b/system-test/cnf/maxscale.cnf.template.regexf_replace similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.regexf_replace rename to system-test/cnf/maxscale.cnf.template.regexf_replace diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.regexf_replace_crash b/system-test/cnf/maxscale.cnf.template.regexf_replace_crash similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.regexf_replace_crash rename to system-test/cnf/maxscale.cnf.template.regexf_replace_crash diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.regexfilter1 b/system-test/cnf/maxscale.cnf.template.regexfilter1 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.regexfilter1 rename to system-test/cnf/maxscale.cnf.template.regexfilter1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.repl_lgc b/system-test/cnf/maxscale.cnf.template.repl_lgc similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.repl_lgc rename to system-test/cnf/maxscale.cnf.template.repl_lgc diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.repl_lgc_big b/system-test/cnf/maxscale.cnf.template.repl_lgc_big similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.repl_lgc_big rename to system-test/cnf/maxscale.cnf.template.repl_lgc_big diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.replication b/system-test/cnf/maxscale.cnf.template.replication similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.replication rename to system-test/cnf/maxscale.cnf.template.replication diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.replication.bug539 b/system-test/cnf/maxscale.cnf.template.replication.bug539 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.replication.bug539 rename to system-test/cnf/maxscale.cnf.template.replication.bug539 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.replication.one_slave b/system-test/cnf/maxscale.cnf.template.replication.one_slave similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.replication.one_slave rename to system-test/cnf/maxscale.cnf.template.replication.one_slave diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.rhint_basic b/system-test/cnf/maxscale.cnf.template.rhint_basic similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.rhint_basic rename to system-test/cnf/maxscale.cnf.template.rhint_basic diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_multi_stmt b/system-test/cnf/maxscale.cnf.template.rwsplit_multi_stmt similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_multi_stmt rename to system-test/cnf/maxscale.cnf.template.rwsplit_multi_stmt diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_not_enough_servers b/system-test/cnf/maxscale.cnf.template.rwsplit_not_enough_servers similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_not_enough_servers rename to system-test/cnf/maxscale.cnf.template.rwsplit_not_enough_servers diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_readonly b/system-test/cnf/maxscale.cnf.template.rwsplit_readonly similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_readonly rename to system-test/cnf/maxscale.cnf.template.rwsplit_readonly diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.schemarouter_duplicate b/system-test/cnf/maxscale.cnf.template.schemarouter_duplicate similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.schemarouter_duplicate rename to system-test/cnf/maxscale.cnf.template.schemarouter_duplicate diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.script b/system-test/cnf/maxscale.cnf.template.script similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.script rename to system-test/cnf/maxscale.cnf.template.script diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.server_weight b/system-test/cnf/maxscale.cnf.template.server_weight similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.server_weight rename to system-test/cnf/maxscale.cnf.template.server_weight diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.session_limits b/system-test/cnf/maxscale.cnf.template.session_limits similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.session_limits rename to system-test/cnf/maxscale.cnf.template.session_limits diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog b/system-test/cnf/maxscale.cnf.template.setup_binlog similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog rename to system-test/cnf/maxscale.cnf.template.setup_binlog diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog.in b/system-test/cnf/maxscale.cnf.template.setup_binlog.in similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog.in rename to system-test/cnf/maxscale.cnf.template.setup_binlog.in diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog1 b/system-test/cnf/maxscale.cnf.template.setup_binlog1 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog1 rename to system-test/cnf/maxscale.cnf.template.setup_binlog1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog2 b/system-test/cnf/maxscale.cnf.template.setup_binlog2 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog2 rename to system-test/cnf/maxscale.cnf.template.setup_binlog2 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_gtid b/system-test/cnf/maxscale.cnf.template.setup_binlog_gtid similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_gtid rename to system-test/cnf/maxscale.cnf.template.setup_binlog_gtid diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync b/system-test/cnf/maxscale.cnf.template.setup_binlog_semisync similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync rename to system-test/cnf/maxscale.cnf.template.setup_binlog_semisync diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss0 b/system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss0 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss0 rename to system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss0 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss1 b/system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss1 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss1 rename to system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs1_ss0 b/system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs1_ss0 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs1_ss0 rename to system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs1_ss0 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe b/system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe rename to system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe_gtid b/system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe_gtid similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe_gtid rename to system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe_gtid diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.sharding b/system-test/cnf/maxscale.cnf.template.sharding similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.sharding rename to system-test/cnf/maxscale.cnf.template.sharding diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.show_monitor_crash b/system-test/cnf/maxscale.cnf.template.show_monitor_crash similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.show_monitor_crash rename to system-test/cnf/maxscale.cnf.template.show_monitor_crash diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.simplejavatest b/system-test/cnf/maxscale.cnf.template.simplejavatest similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.simplejavatest rename to system-test/cnf/maxscale.cnf.template.simplejavatest diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers1 b/system-test/cnf/maxscale.cnf.template.sql_queries_pers1 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers1 rename to system-test/cnf/maxscale.cnf.template.sql_queries_pers1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers10 b/system-test/cnf/maxscale.cnf.template.sql_queries_pers10 similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers10 rename to system-test/cnf/maxscale.cnf.template.sql_queries_pers10 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.ssl b/system-test/cnf/maxscale.cnf.template.ssl similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.ssl rename to system-test/cnf/maxscale.cnf.template.ssl diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load b/system-test/cnf/maxscale.cnf.template.ssl_load similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.ssl_load rename to system-test/cnf/maxscale.cnf.template.ssl_load diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera b/system-test/cnf/maxscale.cnf.template.ssl_load_galera similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera rename to system-test/cnf/maxscale.cnf.template.ssl_load_galera diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.stale_slaves b/system-test/cnf/maxscale.cnf.template.stale_slaves similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.stale_slaves rename to system-test/cnf/maxscale.cnf.template.stale_slaves diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.startup_fail_no_servers b/system-test/cnf/maxscale.cnf.template.startup_fail_no_servers similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.startup_fail_no_servers rename to system-test/cnf/maxscale.cnf.template.startup_fail_no_servers diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.teef_no_master b/system-test/cnf/maxscale.cnf.template.teef_no_master similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.teef_no_master rename to system-test/cnf/maxscale.cnf.template.teef_no_master diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.user_cache b/system-test/cnf/maxscale.cnf.template.user_cache similarity index 100% rename from maxscale-system-test/cnf/maxscale.cnf.template.user_cache rename to system-test/cnf/maxscale.cnf.template.user_cache diff --git a/maxscale-system-test/compound_statement.cpp b/system-test/compound_statement.cpp similarity index 100% rename from maxscale-system-test/compound_statement.cpp rename to system-test/compound_statement.cpp diff --git a/maxscale-system-test/config_test.cpp b/system-test/config_test.cpp similarity index 100% rename from maxscale-system-test/config_test.cpp rename to system-test/config_test.cpp diff --git a/maxscale-system-test/connect_to_nonexisting_db.cpp b/system-test/connect_to_nonexisting_db.cpp similarity index 100% rename from maxscale-system-test/connect_to_nonexisting_db.cpp rename to system-test/connect_to_nonexisting_db.cpp diff --git a/maxscale-system-test/connection_limit.cpp b/system-test/connection_limit.cpp similarity index 100% rename from maxscale-system-test/connection_limit.cpp rename to system-test/connection_limit.cpp diff --git a/maxscale-system-test/copy_logs.sh b/system-test/copy_logs.sh similarity index 100% rename from maxscale-system-test/copy_logs.sh rename to system-test/copy_logs.sh diff --git a/maxscale-system-test/crash_on_bad_sescmd.cpp b/system-test/crash_on_bad_sescmd.cpp similarity index 100% rename from maxscale-system-test/crash_on_bad_sescmd.cpp rename to system-test/crash_on_bad_sescmd.cpp diff --git a/maxscale-system-test/crash_out_of_files.cpp b/system-test/crash_out_of_files.cpp similarity index 100% rename from maxscale-system-test/crash_out_of_files.cpp rename to system-test/crash_out_of_files.cpp diff --git a/maxscale-system-test/create.sql b/system-test/create.sql similarity index 100% rename from maxscale-system-test/create.sql rename to system-test/create.sql diff --git a/maxscale-system-test/create_rds.cpp b/system-test/create_rds.cpp similarity index 100% rename from maxscale-system-test/create_rds.cpp rename to system-test/create_rds.cpp diff --git a/maxscale-system-test/create_rds.sh b/system-test/create_rds.sh similarity index 100% rename from maxscale-system-test/create_rds.sh rename to system-test/create_rds.sh diff --git a/maxscale-system-test/create_user.sh b/system-test/create_user.sh similarity index 100% rename from maxscale-system-test/create_user.sh rename to system-test/create_user.sh diff --git a/maxscale-system-test/create_user_galera.sh b/system-test/create_user_galera.sh similarity index 100% rename from maxscale-system-test/create_user_galera.sh rename to system-test/create_user_galera.sh diff --git a/maxscale-system-test/create_user_ssl.sh b/system-test/create_user_ssl.sh similarity index 100% rename from maxscale-system-test/create_user_ssl.sh rename to system-test/create_user_ssl.sh diff --git a/maxscale-system-test/csmon_test.cpp b/system-test/csmon_test.cpp similarity index 100% rename from maxscale-system-test/csmon_test.cpp rename to system-test/csmon_test.cpp diff --git a/maxscale-system-test/delete_rds.cpp b/system-test/delete_rds.cpp similarity index 100% rename from maxscale-system-test/delete_rds.cpp rename to system-test/delete_rds.cpp diff --git a/maxscale-system-test/demo_prep1.sh b/system-test/demo_prep1.sh similarity index 100% rename from maxscale-system-test/demo_prep1.sh rename to system-test/demo_prep1.sh diff --git a/maxscale-system-test/demo_prep2.sh b/system-test/demo_prep2.sh similarity index 100% rename from maxscale-system-test/demo_prep2.sh rename to system-test/demo_prep2.sh diff --git a/maxscale-system-test/demo_script1.sh b/system-test/demo_script1.sh similarity index 100% rename from maxscale-system-test/demo_script1.sh rename to system-test/demo_script1.sh diff --git a/maxscale-system-test/demo_script2.sh b/system-test/demo_script2.sh similarity index 100% rename from maxscale-system-test/demo_script2.sh rename to system-test/demo_script2.sh diff --git a/maxscale-system-test/demo_script3.sh b/system-test/demo_script3.sh similarity index 100% rename from maxscale-system-test/demo_script3.sh rename to system-test/demo_script3.sh diff --git a/maxscale-system-test/demo_testing.sh b/system-test/demo_testing.sh similarity index 100% rename from maxscale-system-test/demo_testing.sh rename to system-test/demo_testing.sh diff --git a/maxscale-system-test/different_size_binlog.cpp b/system-test/different_size_binlog.cpp similarity index 100% rename from maxscale-system-test/different_size_binlog.cpp rename to system-test/different_size_binlog.cpp diff --git a/maxscale-system-test/different_size_rwsplit.cpp b/system-test/different_size_rwsplit.cpp similarity index 100% rename from maxscale-system-test/different_size_rwsplit.cpp rename to system-test/different_size_rwsplit.cpp diff --git a/maxscale-system-test/encrypted_passwords.cpp b/system-test/encrypted_passwords.cpp similarity index 100% rename from maxscale-system-test/encrypted_passwords.cpp rename to system-test/encrypted_passwords.cpp diff --git a/maxscale-system-test/error_messages.cpp b/system-test/error_messages.cpp similarity index 100% rename from maxscale-system-test/error_messages.cpp rename to system-test/error_messages.cpp diff --git a/maxscale-system-test/fail_switch_rejoin_common.cpp b/system-test/fail_switch_rejoin_common.cpp similarity index 100% rename from maxscale-system-test/fail_switch_rejoin_common.cpp rename to system-test/fail_switch_rejoin_common.cpp diff --git a/maxscale-system-test/failover_common.cpp b/system-test/failover_common.cpp similarity index 100% rename from maxscale-system-test/failover_common.cpp rename to system-test/failover_common.cpp diff --git a/maxscale-system-test/false_monitor_state_change.cpp b/system-test/false_monitor_state_change.cpp similarity index 100% rename from maxscale-system-test/false_monitor_state_change.cpp rename to system-test/false_monitor_state_change.cpp diff --git a/maxscale-system-test/fw/deny1 b/system-test/fw/deny1 similarity index 100% rename from maxscale-system-test/fw/deny1 rename to system-test/fw/deny1 diff --git a/maxscale-system-test/fw/deny10 b/system-test/fw/deny10 similarity index 100% rename from maxscale-system-test/fw/deny10 rename to system-test/fw/deny10 diff --git a/maxscale-system-test/fw/deny11 b/system-test/fw/deny11 similarity index 100% rename from maxscale-system-test/fw/deny11 rename to system-test/fw/deny11 diff --git a/maxscale-system-test/fw/deny12 b/system-test/fw/deny12 similarity index 100% rename from maxscale-system-test/fw/deny12 rename to system-test/fw/deny12 diff --git a/maxscale-system-test/fw/deny13 b/system-test/fw/deny13 similarity index 100% rename from maxscale-system-test/fw/deny13 rename to system-test/fw/deny13 diff --git a/maxscale-system-test/fw/deny14 b/system-test/fw/deny14 similarity index 100% rename from maxscale-system-test/fw/deny14 rename to system-test/fw/deny14 diff --git a/maxscale-system-test/fw/deny15 b/system-test/fw/deny15 similarity index 100% rename from maxscale-system-test/fw/deny15 rename to system-test/fw/deny15 diff --git a/maxscale-system-test/fw/deny16 b/system-test/fw/deny16 similarity index 100% rename from maxscale-system-test/fw/deny16 rename to system-test/fw/deny16 diff --git a/maxscale-system-test/fw/deny17 b/system-test/fw/deny17 similarity index 100% rename from maxscale-system-test/fw/deny17 rename to system-test/fw/deny17 diff --git a/maxscale-system-test/fw/deny18 b/system-test/fw/deny18 similarity index 100% rename from maxscale-system-test/fw/deny18 rename to system-test/fw/deny18 diff --git a/maxscale-system-test/fw/deny19 b/system-test/fw/deny19 similarity index 100% rename from maxscale-system-test/fw/deny19 rename to system-test/fw/deny19 diff --git a/maxscale-system-test/fw/deny2 b/system-test/fw/deny2 similarity index 100% rename from maxscale-system-test/fw/deny2 rename to system-test/fw/deny2 diff --git a/maxscale-system-test/fw/deny3 b/system-test/fw/deny3 similarity index 100% rename from maxscale-system-test/fw/deny3 rename to system-test/fw/deny3 diff --git a/maxscale-system-test/fw/deny4 b/system-test/fw/deny4 similarity index 100% rename from maxscale-system-test/fw/deny4 rename to system-test/fw/deny4 diff --git a/maxscale-system-test/fw/deny5 b/system-test/fw/deny5 similarity index 100% rename from maxscale-system-test/fw/deny5 rename to system-test/fw/deny5 diff --git a/maxscale-system-test/fw/deny6 b/system-test/fw/deny6 similarity index 100% rename from maxscale-system-test/fw/deny6 rename to system-test/fw/deny6 diff --git a/maxscale-system-test/fw/deny7 b/system-test/fw/deny7 similarity index 100% rename from maxscale-system-test/fw/deny7 rename to system-test/fw/deny7 diff --git a/maxscale-system-test/fw/deny8 b/system-test/fw/deny8 similarity index 100% rename from maxscale-system-test/fw/deny8 rename to system-test/fw/deny8 diff --git a/maxscale-system-test/fw/deny9 b/system-test/fw/deny9 similarity index 100% rename from maxscale-system-test/fw/deny9 rename to system-test/fw/deny9 diff --git a/maxscale-system-test/fw/pass1 b/system-test/fw/pass1 similarity index 100% rename from maxscale-system-test/fw/pass1 rename to system-test/fw/pass1 diff --git a/maxscale-system-test/fw/pass10 b/system-test/fw/pass10 similarity index 100% rename from maxscale-system-test/fw/pass10 rename to system-test/fw/pass10 diff --git a/maxscale-system-test/fw/pass11 b/system-test/fw/pass11 similarity index 100% rename from maxscale-system-test/fw/pass11 rename to system-test/fw/pass11 diff --git a/maxscale-system-test/fw/pass12 b/system-test/fw/pass12 similarity index 100% rename from maxscale-system-test/fw/pass12 rename to system-test/fw/pass12 diff --git a/maxscale-system-test/fw/pass13 b/system-test/fw/pass13 similarity index 100% rename from maxscale-system-test/fw/pass13 rename to system-test/fw/pass13 diff --git a/maxscale-system-test/fw/pass14 b/system-test/fw/pass14 similarity index 100% rename from maxscale-system-test/fw/pass14 rename to system-test/fw/pass14 diff --git a/maxscale-system-test/fw/pass15 b/system-test/fw/pass15 similarity index 100% rename from maxscale-system-test/fw/pass15 rename to system-test/fw/pass15 diff --git a/maxscale-system-test/fw/pass16 b/system-test/fw/pass16 similarity index 100% rename from maxscale-system-test/fw/pass16 rename to system-test/fw/pass16 diff --git a/maxscale-system-test/fw/pass17 b/system-test/fw/pass17 similarity index 100% rename from maxscale-system-test/fw/pass17 rename to system-test/fw/pass17 diff --git a/maxscale-system-test/fw/pass18 b/system-test/fw/pass18 similarity index 100% rename from maxscale-system-test/fw/pass18 rename to system-test/fw/pass18 diff --git a/maxscale-system-test/fw/pass19 b/system-test/fw/pass19 similarity index 100% rename from maxscale-system-test/fw/pass19 rename to system-test/fw/pass19 diff --git a/maxscale-system-test/fw/pass2 b/system-test/fw/pass2 similarity index 100% rename from maxscale-system-test/fw/pass2 rename to system-test/fw/pass2 diff --git a/maxscale-system-test/fw/pass3 b/system-test/fw/pass3 similarity index 100% rename from maxscale-system-test/fw/pass3 rename to system-test/fw/pass3 diff --git a/maxscale-system-test/fw/pass4 b/system-test/fw/pass4 similarity index 100% rename from maxscale-system-test/fw/pass4 rename to system-test/fw/pass4 diff --git a/maxscale-system-test/fw/pass5 b/system-test/fw/pass5 similarity index 100% rename from maxscale-system-test/fw/pass5 rename to system-test/fw/pass5 diff --git a/maxscale-system-test/fw/pass6 b/system-test/fw/pass6 similarity index 100% rename from maxscale-system-test/fw/pass6 rename to system-test/fw/pass6 diff --git a/maxscale-system-test/fw/pass7 b/system-test/fw/pass7 similarity index 100% rename from maxscale-system-test/fw/pass7 rename to system-test/fw/pass7 diff --git a/maxscale-system-test/fw/pass8 b/system-test/fw/pass8 similarity index 100% rename from maxscale-system-test/fw/pass8 rename to system-test/fw/pass8 diff --git a/maxscale-system-test/fw/pass9 b/system-test/fw/pass9 similarity index 100% rename from maxscale-system-test/fw/pass9 rename to system-test/fw/pass9 diff --git a/maxscale-system-test/fw/rules1 b/system-test/fw/rules1 similarity index 100% rename from maxscale-system-test/fw/rules1 rename to system-test/fw/rules1 diff --git a/maxscale-system-test/fw/rules10 b/system-test/fw/rules10 similarity index 100% rename from maxscale-system-test/fw/rules10 rename to system-test/fw/rules10 diff --git a/maxscale-system-test/fw/rules11 b/system-test/fw/rules11 similarity index 100% rename from maxscale-system-test/fw/rules11 rename to system-test/fw/rules11 diff --git a/maxscale-system-test/fw/rules12 b/system-test/fw/rules12 similarity index 100% rename from maxscale-system-test/fw/rules12 rename to system-test/fw/rules12 diff --git a/maxscale-system-test/fw/rules13 b/system-test/fw/rules13 similarity index 100% rename from maxscale-system-test/fw/rules13 rename to system-test/fw/rules13 diff --git a/maxscale-system-test/fw/rules14 b/system-test/fw/rules14 similarity index 100% rename from maxscale-system-test/fw/rules14 rename to system-test/fw/rules14 diff --git a/maxscale-system-test/fw/rules15 b/system-test/fw/rules15 similarity index 100% rename from maxscale-system-test/fw/rules15 rename to system-test/fw/rules15 diff --git a/maxscale-system-test/fw/rules16 b/system-test/fw/rules16 similarity index 100% rename from maxscale-system-test/fw/rules16 rename to system-test/fw/rules16 diff --git a/maxscale-system-test/fw/rules17 b/system-test/fw/rules17 similarity index 100% rename from maxscale-system-test/fw/rules17 rename to system-test/fw/rules17 diff --git a/maxscale-system-test/fw/rules18 b/system-test/fw/rules18 similarity index 100% rename from maxscale-system-test/fw/rules18 rename to system-test/fw/rules18 diff --git a/maxscale-system-test/fw/rules19 b/system-test/fw/rules19 similarity index 100% rename from maxscale-system-test/fw/rules19 rename to system-test/fw/rules19 diff --git a/maxscale-system-test/fw/rules2 b/system-test/fw/rules2 similarity index 100% rename from maxscale-system-test/fw/rules2 rename to system-test/fw/rules2 diff --git a/maxscale-system-test/fw/rules3 b/system-test/fw/rules3 similarity index 100% rename from maxscale-system-test/fw/rules3 rename to system-test/fw/rules3 diff --git a/maxscale-system-test/fw/rules4 b/system-test/fw/rules4 similarity index 100% rename from maxscale-system-test/fw/rules4 rename to system-test/fw/rules4 diff --git a/maxscale-system-test/fw/rules5 b/system-test/fw/rules5 similarity index 100% rename from maxscale-system-test/fw/rules5 rename to system-test/fw/rules5 diff --git a/maxscale-system-test/fw/rules6 b/system-test/fw/rules6 similarity index 100% rename from maxscale-system-test/fw/rules6 rename to system-test/fw/rules6 diff --git a/maxscale-system-test/fw/rules7 b/system-test/fw/rules7 similarity index 100% rename from maxscale-system-test/fw/rules7 rename to system-test/fw/rules7 diff --git a/maxscale-system-test/fw/rules8 b/system-test/fw/rules8 similarity index 100% rename from maxscale-system-test/fw/rules8 rename to system-test/fw/rules8 diff --git a/maxscale-system-test/fw/rules9 b/system-test/fw/rules9 similarity index 100% rename from maxscale-system-test/fw/rules9 rename to system-test/fw/rules9 diff --git a/maxscale-system-test/fw/rules_actions b/system-test/fw/rules_actions similarity index 100% rename from maxscale-system-test/fw/rules_actions rename to system-test/fw/rules_actions diff --git a/maxscale-system-test/fw/rules_at_time b/system-test/fw/rules_at_time similarity index 100% rename from maxscale-system-test/fw/rules_at_time rename to system-test/fw/rules_at_time diff --git a/maxscale-system-test/fw/rules_limit_queries b/system-test/fw/rules_limit_queries similarity index 100% rename from maxscale-system-test/fw/rules_limit_queries rename to system-test/fw/rules_limit_queries diff --git a/maxscale-system-test/fw/rules_logging b/system-test/fw/rules_logging similarity index 100% rename from maxscale-system-test/fw/rules_logging rename to system-test/fw/rules_logging diff --git a/maxscale-system-test/fw/rules_mxs1583 b/system-test/fw/rules_mxs1583 similarity index 100% rename from maxscale-system-test/fw/rules_mxs1583 rename to system-test/fw/rules_mxs1583 diff --git a/maxscale-system-test/fw/rules_syntax_error b/system-test/fw/rules_syntax_error similarity index 100% rename from maxscale-system-test/fw/rules_syntax_error rename to system-test/fw/rules_syntax_error diff --git a/maxscale-system-test/fw2/deny1 b/system-test/fw2/deny1 similarity index 100% rename from maxscale-system-test/fw2/deny1 rename to system-test/fw2/deny1 diff --git a/maxscale-system-test/fw2/deny2 b/system-test/fw2/deny2 similarity index 100% rename from maxscale-system-test/fw2/deny2 rename to system-test/fw2/deny2 diff --git a/maxscale-system-test/fw2/deny3 b/system-test/fw2/deny3 similarity index 100% rename from maxscale-system-test/fw2/deny3 rename to system-test/fw2/deny3 diff --git a/maxscale-system-test/fw2/deny4 b/system-test/fw2/deny4 similarity index 100% rename from maxscale-system-test/fw2/deny4 rename to system-test/fw2/deny4 diff --git a/maxscale-system-test/fw2/deny5 b/system-test/fw2/deny5 similarity index 100% rename from maxscale-system-test/fw2/deny5 rename to system-test/fw2/deny5 diff --git a/maxscale-system-test/fw2/pass1 b/system-test/fw2/pass1 similarity index 100% rename from maxscale-system-test/fw2/pass1 rename to system-test/fw2/pass1 diff --git a/maxscale-system-test/fw2/pass2 b/system-test/fw2/pass2 similarity index 100% rename from maxscale-system-test/fw2/pass2 rename to system-test/fw2/pass2 diff --git a/maxscale-system-test/fw2/pass3 b/system-test/fw2/pass3 similarity index 100% rename from maxscale-system-test/fw2/pass3 rename to system-test/fw2/pass3 diff --git a/maxscale-system-test/fw2/pass4 b/system-test/fw2/pass4 similarity index 100% rename from maxscale-system-test/fw2/pass4 rename to system-test/fw2/pass4 diff --git a/maxscale-system-test/fw2/pass5 b/system-test/fw2/pass5 similarity index 100% rename from maxscale-system-test/fw2/pass5 rename to system-test/fw2/pass5 diff --git a/maxscale-system-test/fw2/rules1 b/system-test/fw2/rules1 similarity index 100% rename from maxscale-system-test/fw2/rules1 rename to system-test/fw2/rules1 diff --git a/maxscale-system-test/fw2/rules2 b/system-test/fw2/rules2 similarity index 100% rename from maxscale-system-test/fw2/rules2 rename to system-test/fw2/rules2 diff --git a/maxscale-system-test/fw2/rules3 b/system-test/fw2/rules3 similarity index 100% rename from maxscale-system-test/fw2/rules3 rename to system-test/fw2/rules3 diff --git a/maxscale-system-test/fw2/rules4 b/system-test/fw2/rules4 similarity index 100% rename from maxscale-system-test/fw2/rules4 rename to system-test/fw2/rules4 diff --git a/maxscale-system-test/fw2/rules5 b/system-test/fw2/rules5 similarity index 100% rename from maxscale-system-test/fw2/rules5 rename to system-test/fw2/rules5 diff --git a/maxscale-system-test/fwf.cpp b/system-test/fwf.cpp similarity index 100% rename from maxscale-system-test/fwf.cpp rename to system-test/fwf.cpp diff --git a/maxscale-system-test/fwf2.cpp b/system-test/fwf2.cpp similarity index 100% rename from maxscale-system-test/fwf2.cpp rename to system-test/fwf2.cpp diff --git a/maxscale-system-test/fwf_actions.cpp b/system-test/fwf_actions.cpp similarity index 100% rename from maxscale-system-test/fwf_actions.cpp rename to system-test/fwf_actions.cpp diff --git a/maxscale-system-test/fwf_com_ping.cpp b/system-test/fwf_com_ping.cpp similarity index 100% rename from maxscale-system-test/fwf_com_ping.cpp rename to system-test/fwf_com_ping.cpp diff --git a/maxscale-system-test/fwf_duplicate_rules.cpp b/system-test/fwf_duplicate_rules.cpp similarity index 100% rename from maxscale-system-test/fwf_duplicate_rules.cpp rename to system-test/fwf_duplicate_rules.cpp diff --git a/maxscale-system-test/fwf_logging.cpp b/system-test/fwf_logging.cpp similarity index 100% rename from maxscale-system-test/fwf_logging.cpp rename to system-test/fwf_logging.cpp diff --git a/maxscale-system-test/fwf_prepared_stmt.cpp b/system-test/fwf_prepared_stmt.cpp similarity index 100% rename from maxscale-system-test/fwf_prepared_stmt.cpp rename to system-test/fwf_prepared_stmt.cpp diff --git a/maxscale-system-test/fwf_reload.cpp b/system-test/fwf_reload.cpp similarity index 100% rename from maxscale-system-test/fwf_reload.cpp rename to system-test/fwf_reload.cpp diff --git a/maxscale-system-test/fwf_syntax.cpp b/system-test/fwf_syntax.cpp similarity index 100% rename from maxscale-system-test/fwf_syntax.cpp rename to system-test/fwf_syntax.cpp diff --git a/maxscale-system-test/galera_priority.cpp b/system-test/galera_priority.cpp similarity index 100% rename from maxscale-system-test/galera_priority.cpp rename to system-test/galera_priority.cpp diff --git a/maxscale-system-test/get_logs.sh b/system-test/get_logs.sh similarity index 100% rename from maxscale-system-test/get_logs.sh rename to system-test/get_logs.sh diff --git a/maxscale-system-test/infinite_loop.lua b/system-test/infinite_loop.lua similarity index 100% rename from maxscale-system-test/infinite_loop.lua rename to system-test/infinite_loop.lua diff --git a/maxscale-system-test/insertstream.sh b/system-test/insertstream.sh similarity index 100% rename from maxscale-system-test/insertstream.sh rename to system-test/insertstream.sh diff --git a/maxscale-system-test/insertstream/r/insert.result b/system-test/insertstream/r/insert.result similarity index 100% rename from maxscale-system-test/insertstream/r/insert.result rename to system-test/insertstream/r/insert.result diff --git a/maxscale-system-test/insertstream/r/mixed.result b/system-test/insertstream/r/mixed.result similarity index 100% rename from maxscale-system-test/insertstream/r/mixed.result rename to system-test/insertstream/r/mixed.result diff --git a/maxscale-system-test/insertstream/r/non-trx.result b/system-test/insertstream/r/non-trx.result similarity index 100% rename from maxscale-system-test/insertstream/r/non-trx.result rename to system-test/insertstream/r/non-trx.result diff --git a/maxscale-system-test/insertstream/t/insert.test b/system-test/insertstream/t/insert.test similarity index 100% rename from maxscale-system-test/insertstream/t/insert.test rename to system-test/insertstream/t/insert.test diff --git a/maxscale-system-test/insertstream/t/mixed.test b/system-test/insertstream/t/mixed.test similarity index 100% rename from maxscale-system-test/insertstream/t/mixed.test rename to system-test/insertstream/t/mixed.test diff --git a/maxscale-system-test/insertstream/t/non-trx.test b/system-test/insertstream/t/non-trx.test similarity index 100% rename from maxscale-system-test/insertstream/t/non-trx.test rename to system-test/insertstream/t/non-trx.test diff --git a/maxscale-system-test/install_aws_tool.sh b/system-test/install_aws_tool.sh similarity index 100% rename from maxscale-system-test/install_aws_tool.sh rename to system-test/install_aws_tool.sh diff --git a/maxscale-system-test/keepalived.cpp b/system-test/keepalived.cpp similarity index 100% rename from maxscale-system-test/keepalived.cpp rename to system-test/keepalived.cpp diff --git a/maxscale-system-test/keepalived_cnf/1.conf b/system-test/keepalived_cnf/1.conf similarity index 100% rename from maxscale-system-test/keepalived_cnf/1.conf rename to system-test/keepalived_cnf/1.conf diff --git a/maxscale-system-test/keepalived_cnf/2.conf b/system-test/keepalived_cnf/2.conf similarity index 100% rename from maxscale-system-test/keepalived_cnf/2.conf rename to system-test/keepalived_cnf/2.conf diff --git a/maxscale-system-test/keepalived_cnf/is_maxscale_running.sh b/system-test/keepalived_cnf/is_maxscale_running.sh similarity index 100% rename from maxscale-system-test/keepalived_cnf/is_maxscale_running.sh rename to system-test/keepalived_cnf/is_maxscale_running.sh diff --git a/maxscale-system-test/keepalived_cnf/masterdown1.conf b/system-test/keepalived_cnf/masterdown1.conf similarity index 100% rename from maxscale-system-test/keepalived_cnf/masterdown1.conf rename to system-test/keepalived_cnf/masterdown1.conf diff --git a/maxscale-system-test/keepalived_cnf/masterdown2.conf b/system-test/keepalived_cnf/masterdown2.conf similarity index 100% rename from maxscale-system-test/keepalived_cnf/masterdown2.conf rename to system-test/keepalived_cnf/masterdown2.conf diff --git a/maxscale-system-test/keepalived_cnf/notify_script.sh b/system-test/keepalived_cnf/notify_script.sh similarity index 100% rename from maxscale-system-test/keepalived_cnf/notify_script.sh rename to system-test/keepalived_cnf/notify_script.sh diff --git a/maxscale-system-test/keepalived_masterdown.cpp b/system-test/keepalived_masterdown.cpp similarity index 100% rename from maxscale-system-test/keepalived_masterdown.cpp rename to system-test/keepalived_masterdown.cpp diff --git a/maxscale-system-test/kerb.cnf b/system-test/kerb.cnf similarity index 100% rename from maxscale-system-test/kerb.cnf rename to system-test/kerb.cnf diff --git a/maxscale-system-test/kerberos_setup.cpp b/system-test/kerberos_setup.cpp similarity index 100% rename from maxscale-system-test/kerberos_setup.cpp rename to system-test/kerberos_setup.cpp diff --git a/maxscale-system-test/kill_master.cpp b/system-test/kill_master.cpp similarity index 100% rename from maxscale-system-test/kill_master.cpp rename to system-test/kill_master.cpp diff --git a/maxscale-system-test/kill_query.cpp b/system-test/kill_query.cpp similarity index 100% rename from maxscale-system-test/kill_query.cpp rename to system-test/kill_query.cpp diff --git a/maxscale-system-test/krb5.conf b/system-test/krb5.conf similarity index 100% rename from maxscale-system-test/krb5.conf rename to system-test/krb5.conf diff --git a/maxscale-system-test/labels_list.sh b/system-test/labels_list.sh similarity index 100% rename from maxscale-system-test/labels_list.sh rename to system-test/labels_list.sh diff --git a/maxscale-system-test/load_balancing.cpp b/system-test/load_balancing.cpp similarity index 100% rename from maxscale-system-test/load_balancing.cpp rename to system-test/load_balancing.cpp diff --git a/maxscale-system-test/local_address.cpp b/system-test/local_address.cpp similarity index 100% rename from maxscale-system-test/local_address.cpp rename to system-test/local_address.cpp diff --git a/maxscale-system-test/local_tests/cleanup_db.sh b/system-test/local_tests/cleanup_db.sh similarity index 100% rename from maxscale-system-test/local_tests/cleanup_db.sh rename to system-test/local_tests/cleanup_db.sh diff --git a/maxscale-system-test/local_tests/create_repl_user.sql b/system-test/local_tests/create_repl_user.sql similarity index 100% rename from maxscale-system-test/local_tests/create_repl_user.sql rename to system-test/local_tests/create_repl_user.sql diff --git a/maxscale-system-test/local_tests/create_skysql_user.sql b/system-test/local_tests/create_skysql_user.sql similarity index 100% rename from maxscale-system-test/local_tests/create_skysql_user.sql rename to system-test/local_tests/create_skysql_user.sql diff --git a/maxscale-system-test/local_tests/multiple_servers.cnf b/system-test/local_tests/multiple_servers.cnf similarity index 100% rename from maxscale-system-test/local_tests/multiple_servers.cnf rename to system-test/local_tests/multiple_servers.cnf diff --git a/maxscale-system-test/local_tests/set_env_local.sh b/system-test/local_tests/set_env_local.sh similarity index 90% rename from maxscale-system-test/local_tests/set_env_local.sh rename to system-test/local_tests/set_env_local.sh index 16e4afb48..97318897e 100644 --- a/maxscale-system-test/local_tests/set_env_local.sh +++ b/system-test/local_tests/set_env_local.sh @@ -63,12 +63,12 @@ do start_cmd_var="$prefix"_"$num"_start_db_command stop_cmd_var="$prefix"_"$num"_stop_db_command GRN=`expr $i + 1` - eval 'export $start_cmd_var="mysqld_multi --defaults-file=$HOME/maxscale-system-test/local_tests/multiple_servers.cnf start $GRN"' - eval 'export $stop_cmd_var="mysqld_multi --defaults-file=$HOME/maxscale-system-test/local_tests/multiple_servers.cnf stop $GRN"' + eval 'export $start_cmd_var="mysqld_multi --defaults-file=$HOME/system-test/local_tests/multiple_servers.cnf start $GRN"' + eval 'export $stop_cmd_var="mysqld_multi --defaults-file=$HOME/system-test/local_tests/multiple_servers.cnf stop $GRN"' start_cmd_var="$prefix"_"$num"_cleanup_db_command GRN=`expr $i + 1` - eval 'export $start_cmd_var="$HOME/maxscale-system-test/local_tests/cleanup_db.sh $GRN"' + eval 'export $start_cmd_var="$HOME/system-test/local_tests/cleanup_db.sh $GRN"' # cd .. done diff --git a/maxscale-system-test/local_tests/start_multiple_mariadb.sh b/system-test/local_tests/start_multiple_mariadb.sh similarity index 100% rename from maxscale-system-test/local_tests/start_multiple_mariadb.sh rename to system-test/local_tests/start_multiple_mariadb.sh diff --git a/maxscale-system-test/long_insert.sh b/system-test/long_insert.sh similarity index 100% rename from maxscale-system-test/long_insert.sh rename to system-test/long_insert.sh diff --git a/maxscale-system-test/long_insert_sql/test.sql b/system-test/long_insert_sql/test.sql similarity index 100% rename from maxscale-system-test/long_insert_sql/test.sql rename to system-test/long_insert_sql/test.sql diff --git a/maxscale-system-test/long_insert_sql/test_init.sql b/system-test/long_insert_sql/test_init.sql similarity index 100% rename from maxscale-system-test/long_insert_sql/test_init.sql rename to system-test/long_insert_sql/test_init.sql diff --git a/maxscale-system-test/long_insert_sql/test_query.sql b/system-test/long_insert_sql/test_query.sql similarity index 100% rename from maxscale-system-test/long_insert_sql/test_query.sql rename to system-test/long_insert_sql/test_query.sql diff --git a/maxscale-system-test/long_sysbench.cpp b/system-test/long_sysbench.cpp similarity index 100% rename from maxscale-system-test/long_sysbench.cpp rename to system-test/long_sysbench.cpp diff --git a/maxscale-system-test/long_test.cpp b/system-test/long_test.cpp similarity index 100% rename from maxscale-system-test/long_test.cpp rename to system-test/long_test.cpp diff --git a/maxscale-system-test/longblob.cpp b/system-test/longblob.cpp similarity index 100% rename from maxscale-system-test/longblob.cpp rename to system-test/longblob.cpp diff --git a/maxscale-system-test/lots_of_rows.cpp b/system-test/lots_of_rows.cpp similarity index 100% rename from maxscale-system-test/lots_of_rows.cpp rename to system-test/lots_of_rows.cpp diff --git a/maxscale-system-test/macros.cmake b/system-test/macros.cmake similarity index 100% rename from maxscale-system-test/macros.cmake rename to system-test/macros.cmake diff --git a/maxscale-system-test/manage_mrm.sh b/system-test/manage_mrm.sh similarity index 100% rename from maxscale-system-test/manage_mrm.sh rename to system-test/manage_mrm.sh diff --git a/maxscale-system-test/mariadb_binlog_keys.txt b/system-test/mariadb_binlog_keys.txt similarity index 100% rename from maxscale-system-test/mariadb_binlog_keys.txt rename to system-test/mariadb_binlog_keys.txt diff --git a/maxscale-system-test/mariadb_client_found_rows.cpp b/system-test/mariadb_client_found_rows.cpp similarity index 100% rename from maxscale-system-test/mariadb_client_found_rows.cpp rename to system-test/mariadb_client_found_rows.cpp diff --git a/maxscale-system-test/mariadb_tests_hartmut.sh b/system-test/mariadb_tests_hartmut.sh similarity index 100% rename from maxscale-system-test/mariadb_tests_hartmut.sh rename to system-test/mariadb_tests_hartmut.sh diff --git a/maxscale-system-test/mariadbmonitor/CMakeLists.txt b/system-test/mariadbmonitor/CMakeLists.txt similarity index 100% rename from maxscale-system-test/mariadbmonitor/CMakeLists.txt rename to system-test/mariadbmonitor/CMakeLists.txt diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_detect_standalone_master.cnf b/system-test/mariadbmonitor/mysqlmon_detect_standalone_master.cnf similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_detect_standalone_master.cnf rename to system-test/mariadbmonitor/mysqlmon_detect_standalone_master.cnf diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_detect_standalone_master.cpp b/system-test/mariadbmonitor/mysqlmon_detect_standalone_master.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_detect_standalone_master.cpp rename to system-test/mariadbmonitor/mysqlmon_detect_standalone_master.cpp diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_external_master.cnf b/system-test/mariadbmonitor/mysqlmon_external_master.cnf similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_external_master.cnf rename to system-test/mariadbmonitor/mysqlmon_external_master.cnf diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_external_master.cpp b/system-test/mariadbmonitor/mysqlmon_external_master.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_external_master.cpp rename to system-test/mariadbmonitor/mysqlmon_external_master.cpp diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_events.cpp b/system-test/mariadbmonitor/mysqlmon_fail_switch_events.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_events.cpp rename to system-test/mariadbmonitor/mysqlmon_fail_switch_events.cpp diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_auto.cnf b/system-test/mariadbmonitor/mysqlmon_failover_auto.cnf similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_failover_auto.cnf rename to system-test/mariadbmonitor/mysqlmon_failover_auto.cnf diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_auto.cpp b/system-test/mariadbmonitor/mysqlmon_failover_auto.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_failover_auto.cpp rename to system-test/mariadbmonitor/mysqlmon_failover_auto.cpp diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual.cnf b/system-test/mariadbmonitor/mysqlmon_failover_manual.cnf similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual.cnf rename to system-test/mariadbmonitor/mysqlmon_failover_manual.cnf diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual.cpp b/system-test/mariadbmonitor/mysqlmon_failover_manual.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual.cpp rename to system-test/mariadbmonitor/mysqlmon_failover_manual.cpp diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual2.cpp b/system-test/mariadbmonitor/mysqlmon_failover_manual2.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual2.cpp rename to system-test/mariadbmonitor/mysqlmon_failover_manual2.cpp diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual2_2.cnf b/system-test/mariadbmonitor/mysqlmon_failover_manual2_2.cnf similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual2_2.cnf rename to system-test/mariadbmonitor/mysqlmon_failover_manual2_2.cnf diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual2_3.cnf b/system-test/mariadbmonitor/mysqlmon_failover_manual2_3.cnf similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual2_3.cnf rename to system-test/mariadbmonitor/mysqlmon_failover_manual2_3.cnf diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual2_4.cnf b/system-test/mariadbmonitor/mysqlmon_failover_manual2_4.cnf similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual2_4.cnf rename to system-test/mariadbmonitor/mysqlmon_failover_manual2_4.cnf diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_no_slaves.cpp b/system-test/mariadbmonitor/mysqlmon_failover_no_slaves.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_failover_no_slaves.cpp rename to system-test/mariadbmonitor/mysqlmon_failover_no_slaves.cpp diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_readonly.cnf b/system-test/mariadbmonitor/mysqlmon_failover_readonly.cnf similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_failover_readonly.cnf rename to system-test/mariadbmonitor/mysqlmon_failover_readonly.cnf diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_readonly.cpp b/system-test/mariadbmonitor/mysqlmon_failover_readonly.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_failover_readonly.cpp rename to system-test/mariadbmonitor/mysqlmon_failover_readonly.cpp diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rejoin_old_slave.cnf b/system-test/mariadbmonitor/mysqlmon_failover_rejoin_old_slave.cnf similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_failover_rejoin_old_slave.cnf rename to system-test/mariadbmonitor/mysqlmon_failover_rejoin_old_slave.cnf diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rejoin_old_slave.cpp b/system-test/mariadbmonitor/mysqlmon_failover_rejoin_old_slave.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_failover_rejoin_old_slave.cpp rename to system-test/mariadbmonitor/mysqlmon_failover_rejoin_old_slave.cpp diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_master.cnf b/system-test/mariadbmonitor/mysqlmon_failover_rolling_master.cnf similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_master.cnf rename to system-test/mariadbmonitor/mysqlmon_failover_rolling_master.cnf diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_master.cpp b/system-test/mariadbmonitor/mysqlmon_failover_rolling_master.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_master.cpp rename to system-test/mariadbmonitor/mysqlmon_failover_rolling_master.cpp diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_restart_slaves.cnf b/system-test/mariadbmonitor/mysqlmon_failover_rolling_restart_slaves.cnf similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_restart_slaves.cnf rename to system-test/mariadbmonitor/mysqlmon_failover_rolling_restart_slaves.cnf diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_restart_slaves.cpp b/system-test/mariadbmonitor/mysqlmon_failover_rolling_restart_slaves.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_restart_slaves.cpp rename to system-test/mariadbmonitor/mysqlmon_failover_rolling_restart_slaves.cpp diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_stress.cnf b/system-test/mariadbmonitor/mysqlmon_failover_stress.cnf similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_failover_stress.cnf rename to system-test/mariadbmonitor/mysqlmon_failover_stress.cnf diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_failover_stress.cpp b/system-test/mariadbmonitor/mysqlmon_failover_stress.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_failover_stress.cpp rename to system-test/mariadbmonitor/mysqlmon_failover_stress.cpp diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_multimaster.cnf b/system-test/mariadbmonitor/mysqlmon_multimaster.cnf similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_multimaster.cnf rename to system-test/mariadbmonitor/mysqlmon_multimaster.cnf diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_multimaster.cpp b/system-test/mariadbmonitor/mysqlmon_multimaster.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_multimaster.cpp rename to system-test/mariadbmonitor/mysqlmon_multimaster.cpp diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_multimaster_serverid.cnf b/system-test/mariadbmonitor/mysqlmon_multimaster_serverid.cnf similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_multimaster_serverid.cnf rename to system-test/mariadbmonitor/mysqlmon_multimaster_serverid.cnf diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad.cpp b/system-test/mariadbmonitor/mysqlmon_rejoin_bad.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad.cpp rename to system-test/mariadbmonitor/mysqlmon_rejoin_bad.cpp diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad2.cpp b/system-test/mariadbmonitor/mysqlmon_rejoin_bad2.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad2.cpp rename to system-test/mariadbmonitor/mysqlmon_rejoin_bad2.cpp diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_good.cnf b/system-test/mariadbmonitor/mysqlmon_rejoin_good.cnf similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_good.cnf rename to system-test/mariadbmonitor/mysqlmon_rejoin_good.cnf diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_good.cpp b/system-test/mariadbmonitor/mysqlmon_rejoin_good.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_good.cpp rename to system-test/mariadbmonitor/mysqlmon_rejoin_good.cpp diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_manual.cnf b/system-test/mariadbmonitor/mysqlmon_rejoin_manual.cnf similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_manual.cnf rename to system-test/mariadbmonitor/mysqlmon_rejoin_manual.cnf diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_manual.cpp b/system-test/mariadbmonitor/mysqlmon_rejoin_manual.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_manual.cpp rename to system-test/mariadbmonitor/mysqlmon_rejoin_manual.cpp diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_manual2.cpp b/system-test/mariadbmonitor/mysqlmon_rejoin_manual2.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_manual2.cpp rename to system-test/mariadbmonitor/mysqlmon_rejoin_manual2.cpp diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_reset_replication.cpp b/system-test/mariadbmonitor/mysqlmon_reset_replication.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_reset_replication.cpp rename to system-test/mariadbmonitor/mysqlmon_reset_replication.cpp diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover.cnf b/system-test/mariadbmonitor/mysqlmon_switchover.cnf similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_switchover.cnf rename to system-test/mariadbmonitor/mysqlmon_switchover.cnf diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover.cpp b/system-test/mariadbmonitor/mysqlmon_switchover.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_switchover.cpp rename to system-test/mariadbmonitor/mysqlmon_switchover.cpp diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_auto.cnf b/system-test/mariadbmonitor/mysqlmon_switchover_auto.cnf similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_switchover_auto.cnf rename to system-test/mariadbmonitor/mysqlmon_switchover_auto.cnf diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_auto.cpp b/system-test/mariadbmonitor/mysqlmon_switchover_auto.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_switchover_auto.cpp rename to system-test/mariadbmonitor/mysqlmon_switchover_auto.cpp diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_bad_master.cnf b/system-test/mariadbmonitor/mysqlmon_switchover_bad_master.cnf similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_switchover_bad_master.cnf rename to system-test/mariadbmonitor/mysqlmon_switchover_bad_master.cnf diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_bad_master.cpp b/system-test/mariadbmonitor/mysqlmon_switchover_bad_master.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_switchover_bad_master.cpp rename to system-test/mariadbmonitor/mysqlmon_switchover_bad_master.cpp diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_stress.cnf b/system-test/mariadbmonitor/mysqlmon_switchover_stress.cnf similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_switchover_stress.cnf rename to system-test/mariadbmonitor/mysqlmon_switchover_stress.cnf diff --git a/maxscale-system-test/mariadbmonitor/mysqlmon_switchover_stress.cpp b/system-test/mariadbmonitor/mysqlmon_switchover_stress.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/mysqlmon_switchover_stress.cpp rename to system-test/mariadbmonitor/mysqlmon_switchover_stress.cpp diff --git a/maxscale-system-test/mariadbmonitor/verify_master_failure.cnf b/system-test/mariadbmonitor/verify_master_failure.cnf similarity index 100% rename from maxscale-system-test/mariadbmonitor/verify_master_failure.cnf rename to system-test/mariadbmonitor/verify_master_failure.cnf diff --git a/maxscale-system-test/mariadbmonitor/verify_master_failure.cpp b/system-test/mariadbmonitor/verify_master_failure.cpp similarity index 100% rename from maxscale-system-test/mariadbmonitor/verify_master_failure.cpp rename to system-test/mariadbmonitor/verify_master_failure.cpp diff --git a/maxscale-system-test/masking/README.TXT b/system-test/masking/README.TXT similarity index 100% rename from maxscale-system-test/masking/README.TXT rename to system-test/masking/README.TXT diff --git a/maxscale-system-test/masking/masking_mysqltest/masking_rules.json b/system-test/masking/masking_mysqltest/masking_rules.json similarity index 100% rename from maxscale-system-test/masking/masking_mysqltest/masking_rules.json rename to system-test/masking/masking_mysqltest/masking_rules.json diff --git a/maxscale-system-test/masking/masking_mysqltest/r/masking_column.result b/system-test/masking/masking_mysqltest/r/masking_column.result similarity index 100% rename from maxscale-system-test/masking/masking_mysqltest/r/masking_column.result rename to system-test/masking/masking_mysqltest/r/masking_column.result diff --git a/maxscale-system-test/masking/masking_mysqltest/r/masking_mxs1733.result b/system-test/masking/masking_mysqltest/r/masking_mxs1733.result similarity index 100% rename from maxscale-system-test/masking/masking_mysqltest/r/masking_mxs1733.result rename to system-test/masking/masking_mysqltest/r/masking_mxs1733.result diff --git a/maxscale-system-test/masking/masking_mysqltest/r/masking_replace.result b/system-test/masking/masking_mysqltest/r/masking_replace.result similarity index 100% rename from maxscale-system-test/masking/masking_mysqltest/r/masking_replace.result rename to system-test/masking/masking_mysqltest/r/masking_replace.result diff --git a/maxscale-system-test/masking/masking_mysqltest/r/masking_smoke.result b/system-test/masking/masking_mysqltest/r/masking_smoke.result similarity index 100% rename from maxscale-system-test/masking/masking_mysqltest/r/masking_smoke.result rename to system-test/masking/masking_mysqltest/r/masking_smoke.result diff --git a/maxscale-system-test/masking/masking_mysqltest/t/masking_column.test b/system-test/masking/masking_mysqltest/t/masking_column.test similarity index 100% rename from maxscale-system-test/masking/masking_mysqltest/t/masking_column.test rename to system-test/masking/masking_mysqltest/t/masking_column.test diff --git a/maxscale-system-test/masking/masking_mysqltest/t/masking_mxs1733.test b/system-test/masking/masking_mysqltest/t/masking_mxs1733.test similarity index 100% rename from maxscale-system-test/masking/masking_mysqltest/t/masking_mxs1733.test rename to system-test/masking/masking_mysqltest/t/masking_mxs1733.test diff --git a/maxscale-system-test/masking/masking_mysqltest/t/masking_replace.test b/system-test/masking/masking_mysqltest/t/masking_replace.test similarity index 100% rename from maxscale-system-test/masking/masking_mysqltest/t/masking_replace.test rename to system-test/masking/masking_mysqltest/t/masking_replace.test diff --git a/maxscale-system-test/masking/masking_mysqltest/t/masking_smoke.test b/system-test/masking/masking_mysqltest/t/masking_smoke.test similarity index 100% rename from maxscale-system-test/masking/masking_mysqltest/t/masking_smoke.test rename to system-test/masking/masking_mysqltest/t/masking_smoke.test diff --git a/maxscale-system-test/masking/masking_user/masking_rules.json b/system-test/masking/masking_user/masking_rules.json similarity index 100% rename from maxscale-system-test/masking/masking_user/masking_rules.json rename to system-test/masking/masking_user/masking_rules.json diff --git a/maxscale-system-test/masking/masking_user/r/masking_user_maxskysql.result b/system-test/masking/masking_user/r/masking_user_maxskysql.result similarity index 100% rename from maxscale-system-test/masking/masking_user/r/masking_user_maxskysql.result rename to system-test/masking/masking_user/r/masking_user_maxskysql.result diff --git a/maxscale-system-test/masking/masking_user/r/masking_user_skysql.result b/system-test/masking/masking_user/r/masking_user_skysql.result similarity index 100% rename from maxscale-system-test/masking/masking_user/r/masking_user_skysql.result rename to system-test/masking/masking_user/r/masking_user_skysql.result diff --git a/maxscale-system-test/masking/masking_user/t/masking_user.test b/system-test/masking/masking_user/t/masking_user.test similarity index 100% rename from maxscale-system-test/masking/masking_user/t/masking_user.test rename to system-test/masking/masking_user/t/masking_user.test diff --git a/maxscale-system-test/masking_auto_firewall.cpp b/system-test/masking_auto_firewall.cpp similarity index 100% rename from maxscale-system-test/masking_auto_firewall.cpp rename to system-test/masking_auto_firewall.cpp diff --git a/maxscale-system-test/masking_auto_firewall.json b/system-test/masking_auto_firewall.json similarity index 100% rename from maxscale-system-test/masking_auto_firewall.json rename to system-test/masking_auto_firewall.json diff --git a/maxscale-system-test/masking_mysqltest_driver.sh b/system-test/masking_mysqltest_driver.sh similarity index 100% rename from maxscale-system-test/masking_mysqltest_driver.sh rename to system-test/masking_mysqltest_driver.sh diff --git a/maxscale-system-test/masking_user.sh b/system-test/masking_user.sh similarity index 100% rename from maxscale-system-test/masking_user.sh rename to system-test/masking_user.sh diff --git a/maxscale-system-test/max_connections.cpp b/system-test/max_connections.cpp similarity index 100% rename from maxscale-system-test/max_connections.cpp rename to system-test/max_connections.cpp diff --git a/maxscale-system-test/maxadmin_cmd_crash.cpp b/system-test/maxadmin_cmd_crash.cpp similarity index 100% rename from maxscale-system-test/maxadmin_cmd_crash.cpp rename to system-test/maxadmin_cmd_crash.cpp diff --git a/maxscale-system-test/maxadmin_show_users_crash.cpp b/system-test/maxadmin_show_users_crash.cpp similarity index 100% rename from maxscale-system-test/maxadmin_show_users_crash.cpp rename to system-test/maxadmin_show_users_crash.cpp diff --git a/maxscale-system-test/maxctrl_basic.cpp b/system-test/maxctrl_basic.cpp similarity index 100% rename from maxscale-system-test/maxctrl_basic.cpp rename to system-test/maxctrl_basic.cpp diff --git a/maxscale-system-test/maxctrl_scripts.sh.in b/system-test/maxctrl_scripts.sh.in similarity index 100% rename from maxscale-system-test/maxctrl_scripts.sh.in rename to system-test/maxctrl_scripts.sh.in diff --git a/maxscale-system-test/maxinfo.py b/system-test/maxinfo.py similarity index 100% rename from maxscale-system-test/maxinfo.py rename to system-test/maxinfo.py diff --git a/maxscale-system-test/maxinfo_sql.cpp b/system-test/maxinfo_sql.cpp similarity index 100% rename from maxscale-system-test/maxinfo_sql.cpp rename to system-test/maxinfo_sql.cpp diff --git a/maxscale-system-test/maxpython.py b/system-test/maxpython.py similarity index 100% rename from maxscale-system-test/maxpython.py rename to system-test/maxpython.py diff --git a/maxscale-system-test/maxscale-system-test.env b/system-test/maxscale-system-test.env similarity index 100% rename from maxscale-system-test/maxscale-system-test.env rename to system-test/maxscale-system-test.env diff --git a/maxscale-system-test/maxscale/java/CMakeLists.txt b/system-test/maxscale/java/CMakeLists.txt similarity index 100% rename from maxscale-system-test/maxscale/java/CMakeLists.txt rename to system-test/maxscale/java/CMakeLists.txt diff --git a/maxscale-system-test/maxscale/java/MaxScaleConfiguration.java.in b/system-test/maxscale/java/MaxScaleConfiguration.java.in similarity index 100% rename from maxscale-system-test/maxscale/java/MaxScaleConfiguration.java.in rename to system-test/maxscale/java/MaxScaleConfiguration.java.in diff --git a/maxscale-system-test/maxscale/java/MaxScaleConnection.java b/system-test/maxscale/java/MaxScaleConnection.java similarity index 100% rename from maxscale-system-test/maxscale/java/MaxScaleConnection.java rename to system-test/maxscale/java/MaxScaleConnection.java diff --git a/maxscale-system-test/maxscale/java/batch/BatchInsert.java b/system-test/maxscale/java/batch/BatchInsert.java similarity index 100% rename from maxscale-system-test/maxscale/java/batch/BatchInsert.java rename to system-test/maxscale/java/batch/BatchInsert.java diff --git a/maxscale-system-test/maxscale/java/batch/CMakeLists.txt b/system-test/maxscale/java/batch/CMakeLists.txt similarity index 100% rename from maxscale-system-test/maxscale/java/batch/CMakeLists.txt rename to system-test/maxscale/java/batch/CMakeLists.txt diff --git a/maxscale-system-test/maxscale/java/prep_stmt/CMakeLists.txt b/system-test/maxscale/java/prep_stmt/CMakeLists.txt similarity index 100% rename from maxscale-system-test/maxscale/java/prep_stmt/CMakeLists.txt rename to system-test/maxscale/java/prep_stmt/CMakeLists.txt diff --git a/maxscale-system-test/maxscale/java/prep_stmt/PrepStmtTest.java b/system-test/maxscale/java/prep_stmt/PrepStmtTest.java similarity index 100% rename from maxscale-system-test/maxscale/java/prep_stmt/PrepStmtTest.java rename to system-test/maxscale/java/prep_stmt/PrepStmtTest.java diff --git a/maxscale-system-test/maxscale/java/test1/CMakeLists.txt b/system-test/maxscale/java/test1/CMakeLists.txt similarity index 100% rename from maxscale-system-test/maxscale/java/test1/CMakeLists.txt rename to system-test/maxscale/java/test1/CMakeLists.txt diff --git a/maxscale-system-test/maxscale/java/test1/SimpleConnectorJTest.java b/system-test/maxscale/java/test1/SimpleConnectorJTest.java similarity index 100% rename from maxscale-system-test/maxscale/java/test1/SimpleConnectorJTest.java rename to system-test/maxscale/java/test1/SimpleConnectorJTest.java diff --git a/maxscale-system-test/maxscale_process_user.cpp b/system-test/maxscale_process_user.cpp similarity index 100% rename from maxscale-system-test/maxscale_process_user.cpp rename to system-test/maxscale_process_user.cpp diff --git a/maxscale-system-test/maxtest/CMakeLists.txt b/system-test/maxtest/CMakeLists.txt similarity index 100% rename from maxscale-system-test/maxtest/CMakeLists.txt rename to system-test/maxtest/CMakeLists.txt diff --git a/maxscale-system-test/maxtest/include/maxtest/appexception.hh b/system-test/maxtest/include/maxtest/appexception.hh similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/appexception.hh rename to system-test/maxtest/include/maxtest/appexception.hh diff --git a/maxscale-system-test/maxtest/include/maxtest/big_load.h b/system-test/maxtest/include/maxtest/big_load.h similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/big_load.h rename to system-test/maxtest/include/maxtest/big_load.h diff --git a/maxscale-system-test/maxtest/include/maxtest/blob_test.h b/system-test/maxtest/include/maxtest/blob_test.h similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/blob_test.h rename to system-test/maxtest/include/maxtest/blob_test.h diff --git a/maxscale-system-test/maxtest/include/maxtest/config_operations.h b/system-test/maxtest/include/maxtest/config_operations.h similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/config_operations.h rename to system-test/maxtest/include/maxtest/config_operations.h diff --git a/maxscale-system-test/maxtest/include/maxtest/different_size.h b/system-test/maxtest/include/maxtest/different_size.h similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/different_size.h rename to system-test/maxtest/include/maxtest/different_size.h diff --git a/maxscale-system-test/maxtest/include/maxtest/envv.hh b/system-test/maxtest/include/maxtest/envv.hh similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/envv.hh rename to system-test/maxtest/include/maxtest/envv.hh diff --git a/maxscale-system-test/maxtest/include/maxtest/execute_cmd.hh b/system-test/maxtest/include/maxtest/execute_cmd.hh similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/execute_cmd.hh rename to system-test/maxtest/include/maxtest/execute_cmd.hh diff --git a/maxscale-system-test/maxtest/include/maxtest/fw_copy_rules.h b/system-test/maxtest/include/maxtest/fw_copy_rules.h similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/fw_copy_rules.h rename to system-test/maxtest/include/maxtest/fw_copy_rules.h diff --git a/maxscale-system-test/maxtest/include/maxtest/get_com_select_insert.h b/system-test/maxtest/include/maxtest/get_com_select_insert.h similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/get_com_select_insert.h rename to system-test/maxtest/include/maxtest/get_com_select_insert.h diff --git a/maxscale-system-test/maxtest/include/maxtest/get_my_ip.h b/system-test/maxtest/include/maxtest/get_my_ip.h similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/get_my_ip.h rename to system-test/maxtest/include/maxtest/get_my_ip.h diff --git a/maxscale-system-test/maxtest/include/maxtest/keepalived_func.h b/system-test/maxtest/include/maxtest/keepalived_func.h similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/keepalived_func.h rename to system-test/maxtest/include/maxtest/keepalived_func.h diff --git a/maxscale-system-test/maxtest/include/maxtest/mariadb_func.h b/system-test/maxtest/include/maxtest/mariadb_func.h similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/mariadb_func.h rename to system-test/maxtest/include/maxtest/mariadb_func.h diff --git a/maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.h b/system-test/maxtest/include/maxtest/mariadb_nodes.h similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.h rename to system-test/maxtest/include/maxtest/mariadb_nodes.h diff --git a/maxscale-system-test/maxtest/include/maxtest/maxadmin_operations.h b/system-test/maxtest/include/maxtest/maxadmin_operations.h similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/maxadmin_operations.h rename to system-test/maxtest/include/maxtest/maxadmin_operations.h diff --git a/maxscale-system-test/maxtest/include/maxtest/maxinfo_func.h b/system-test/maxtest/include/maxtest/maxinfo_func.h similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/maxinfo_func.h rename to system-test/maxtest/include/maxtest/maxinfo_func.h diff --git a/maxscale-system-test/maxtest/include/maxtest/maxscales.hh b/system-test/maxtest/include/maxtest/maxscales.hh similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/maxscales.hh rename to system-test/maxtest/include/maxtest/maxscales.hh diff --git a/maxscale-system-test/maxtest/include/maxtest/nodes.hh b/system-test/maxtest/include/maxtest/nodes.hh similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/nodes.hh rename to system-test/maxtest/include/maxtest/nodes.hh diff --git a/maxscale-system-test/maxtest/include/maxtest/rds_vpc.h b/system-test/maxtest/include/maxtest/rds_vpc.h similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/rds_vpc.h rename to system-test/maxtest/include/maxtest/rds_vpc.h diff --git a/maxscale-system-test/maxtest/include/maxtest/sql_t1.h b/system-test/maxtest/include/maxtest/sql_t1.h similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/sql_t1.h rename to system-test/maxtest/include/maxtest/sql_t1.h diff --git a/maxscale-system-test/maxtest/include/maxtest/stopwatch.hh b/system-test/maxtest/include/maxtest/stopwatch.hh similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/stopwatch.hh rename to system-test/maxtest/include/maxtest/stopwatch.hh diff --git a/maxscale-system-test/maxtest/include/maxtest/tcp_connection.hh b/system-test/maxtest/include/maxtest/tcp_connection.hh similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/tcp_connection.hh rename to system-test/maxtest/include/maxtest/tcp_connection.hh diff --git a/maxscale-system-test/maxtest/include/maxtest/test_binlog_fnc.h b/system-test/maxtest/include/maxtest/test_binlog_fnc.h similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/test_binlog_fnc.h rename to system-test/maxtest/include/maxtest/test_binlog_fnc.h diff --git a/maxscale-system-test/maxtest/include/maxtest/test_dir.hh b/system-test/maxtest/include/maxtest/test_dir.hh similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/test_dir.hh rename to system-test/maxtest/include/maxtest/test_dir.hh diff --git a/maxscale-system-test/maxtest/include/maxtest/test_info.hh b/system-test/maxtest/include/maxtest/test_info.hh similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/test_info.hh rename to system-test/maxtest/include/maxtest/test_info.hh diff --git a/maxscale-system-test/maxtest/include/maxtest/testconnections.h b/system-test/maxtest/include/maxtest/testconnections.h similarity index 100% rename from maxscale-system-test/maxtest/include/maxtest/testconnections.h rename to system-test/maxtest/include/maxtest/testconnections.h diff --git a/maxscale-system-test/maxtest/src/CMakeLists.txt b/system-test/maxtest/src/CMakeLists.txt similarity index 100% rename from maxscale-system-test/maxtest/src/CMakeLists.txt rename to system-test/maxtest/src/CMakeLists.txt diff --git a/maxscale-system-test/maxtest/src/big_load.cc b/system-test/maxtest/src/big_load.cc similarity index 100% rename from maxscale-system-test/maxtest/src/big_load.cc rename to system-test/maxtest/src/big_load.cc diff --git a/maxscale-system-test/maxtest/src/blob_test.cc b/system-test/maxtest/src/blob_test.cc similarity index 100% rename from maxscale-system-test/maxtest/src/blob_test.cc rename to system-test/maxtest/src/blob_test.cc diff --git a/maxscale-system-test/maxtest/src/config_operations.cc b/system-test/maxtest/src/config_operations.cc similarity index 100% rename from maxscale-system-test/maxtest/src/config_operations.cc rename to system-test/maxtest/src/config_operations.cc diff --git a/maxscale-system-test/maxtest/src/different_size.cc b/system-test/maxtest/src/different_size.cc similarity index 100% rename from maxscale-system-test/maxtest/src/different_size.cc rename to system-test/maxtest/src/different_size.cc diff --git a/maxscale-system-test/maxtest/src/envv.cc b/system-test/maxtest/src/envv.cc similarity index 100% rename from maxscale-system-test/maxtest/src/envv.cc rename to system-test/maxtest/src/envv.cc diff --git a/maxscale-system-test/maxtest/src/execute_cmd.cc b/system-test/maxtest/src/execute_cmd.cc similarity index 100% rename from maxscale-system-test/maxtest/src/execute_cmd.cc rename to system-test/maxtest/src/execute_cmd.cc diff --git a/maxscale-system-test/maxtest/src/fw_copy_rules.cc b/system-test/maxtest/src/fw_copy_rules.cc similarity index 100% rename from maxscale-system-test/maxtest/src/fw_copy_rules.cc rename to system-test/maxtest/src/fw_copy_rules.cc diff --git a/maxscale-system-test/maxtest/src/get_com_select_insert.cc b/system-test/maxtest/src/get_com_select_insert.cc similarity index 100% rename from maxscale-system-test/maxtest/src/get_com_select_insert.cc rename to system-test/maxtest/src/get_com_select_insert.cc diff --git a/maxscale-system-test/maxtest/src/get_my_ip.cc b/system-test/maxtest/src/get_my_ip.cc similarity index 100% rename from maxscale-system-test/maxtest/src/get_my_ip.cc rename to system-test/maxtest/src/get_my_ip.cc diff --git a/maxscale-system-test/maxtest/src/keepalived_func.cc b/system-test/maxtest/src/keepalived_func.cc similarity index 100% rename from maxscale-system-test/maxtest/src/keepalived_func.cc rename to system-test/maxtest/src/keepalived_func.cc diff --git a/maxscale-system-test/maxtest/src/mariadb_func.cc b/system-test/maxtest/src/mariadb_func.cc similarity index 100% rename from maxscale-system-test/maxtest/src/mariadb_func.cc rename to system-test/maxtest/src/mariadb_func.cc diff --git a/maxscale-system-test/maxtest/src/mariadb_nodes.cc b/system-test/maxtest/src/mariadb_nodes.cc similarity index 100% rename from maxscale-system-test/maxtest/src/mariadb_nodes.cc rename to system-test/maxtest/src/mariadb_nodes.cc diff --git a/maxscale-system-test/maxtest/src/maxadmin_operations.cc b/system-test/maxtest/src/maxadmin_operations.cc similarity index 100% rename from maxscale-system-test/maxtest/src/maxadmin_operations.cc rename to system-test/maxtest/src/maxadmin_operations.cc diff --git a/maxscale-system-test/maxtest/src/maxinfo_func.cc b/system-test/maxtest/src/maxinfo_func.cc similarity index 100% rename from maxscale-system-test/maxtest/src/maxinfo_func.cc rename to system-test/maxtest/src/maxinfo_func.cc diff --git a/maxscale-system-test/maxtest/src/maxscales.cc b/system-test/maxtest/src/maxscales.cc similarity index 100% rename from maxscale-system-test/maxtest/src/maxscales.cc rename to system-test/maxtest/src/maxscales.cc diff --git a/maxscale-system-test/maxtest/src/nodes.cc b/system-test/maxtest/src/nodes.cc similarity index 100% rename from maxscale-system-test/maxtest/src/nodes.cc rename to system-test/maxtest/src/nodes.cc diff --git a/maxscale-system-test/maxtest/src/rds_vpc.cc b/system-test/maxtest/src/rds_vpc.cc similarity index 100% rename from maxscale-system-test/maxtest/src/rds_vpc.cc rename to system-test/maxtest/src/rds_vpc.cc diff --git a/maxscale-system-test/maxtest/src/sql_t1.cc b/system-test/maxtest/src/sql_t1.cc similarity index 100% rename from maxscale-system-test/maxtest/src/sql_t1.cc rename to system-test/maxtest/src/sql_t1.cc diff --git a/maxscale-system-test/maxtest/src/stopwatch.cc b/system-test/maxtest/src/stopwatch.cc similarity index 100% rename from maxscale-system-test/maxtest/src/stopwatch.cc rename to system-test/maxtest/src/stopwatch.cc diff --git a/maxscale-system-test/maxtest/src/tcp_connection.cc b/system-test/maxtest/src/tcp_connection.cc similarity index 100% rename from maxscale-system-test/maxtest/src/tcp_connection.cc rename to system-test/maxtest/src/tcp_connection.cc diff --git a/maxscale-system-test/maxtest/src/test_binlog_fnc.cc b/system-test/maxtest/src/test_binlog_fnc.cc similarity index 100% rename from maxscale-system-test/maxtest/src/test_binlog_fnc.cc rename to system-test/maxtest/src/test_binlog_fnc.cc diff --git a/maxscale-system-test/maxtest/src/test_info.cc.in b/system-test/maxtest/src/test_info.cc.in similarity index 100% rename from maxscale-system-test/maxtest/src/test_info.cc.in rename to system-test/maxtest/src/test_info.cc.in diff --git a/maxscale-system-test/maxtest/src/testconnections.cc b/system-test/maxtest/src/testconnections.cc similarity index 100% rename from maxscale-system-test/maxtest/src/testconnections.cc rename to system-test/maxtest/src/testconnections.cc diff --git a/maxscale-system-test/mdbci/README.md b/system-test/mdbci/README.md similarity index 100% rename from maxscale-system-test/mdbci/README.md rename to system-test/mdbci/README.md diff --git a/maxscale-system-test/mdbci/add_core_cnf.sh b/system-test/mdbci/add_core_cnf.sh similarity index 100% rename from maxscale-system-test/mdbci/add_core_cnf.sh rename to system-test/mdbci/add_core_cnf.sh diff --git a/maxscale-system-test/mdbci/backend/create_repl_user.sql b/system-test/mdbci/backend/create_repl_user.sql similarity index 100% rename from maxscale-system-test/mdbci/backend/create_repl_user.sql rename to system-test/mdbci/backend/create_repl_user.sql diff --git a/maxscale-system-test/mdbci/backend/create_skysql_user.sql b/system-test/mdbci/backend/create_skysql_user.sql similarity index 100% rename from maxscale-system-test/mdbci/backend/create_skysql_user.sql rename to system-test/mdbci/backend/create_skysql_user.sql diff --git a/maxscale-system-test/mdbci/cnf/galera_server1.cnf b/system-test/mdbci/cnf/galera_server1.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/galera_server1.cnf rename to system-test/mdbci/cnf/galera_server1.cnf diff --git a/maxscale-system-test/mdbci/cnf/galera_server2.cnf b/system-test/mdbci/cnf/galera_server2.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/galera_server2.cnf rename to system-test/mdbci/cnf/galera_server2.cnf diff --git a/maxscale-system-test/mdbci/cnf/galera_server3.cnf b/system-test/mdbci/cnf/galera_server3.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/galera_server3.cnf rename to system-test/mdbci/cnf/galera_server3.cnf diff --git a/maxscale-system-test/mdbci/cnf/galera_server4.cnf b/system-test/mdbci/cnf/galera_server4.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/galera_server4.cnf rename to system-test/mdbci/cnf/galera_server4.cnf diff --git a/maxscale-system-test/mdbci/cnf/mysql56/galera_server1.cnf b/system-test/mdbci/cnf/mysql56/galera_server1.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/mysql56/galera_server1.cnf rename to system-test/mdbci/cnf/mysql56/galera_server1.cnf diff --git a/maxscale-system-test/mdbci/cnf/mysql56/galera_server2.cnf b/system-test/mdbci/cnf/mysql56/galera_server2.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/mysql56/galera_server2.cnf rename to system-test/mdbci/cnf/mysql56/galera_server2.cnf diff --git a/maxscale-system-test/mdbci/cnf/mysql56/galera_server3.cnf b/system-test/mdbci/cnf/mysql56/galera_server3.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/mysql56/galera_server3.cnf rename to system-test/mdbci/cnf/mysql56/galera_server3.cnf diff --git a/maxscale-system-test/mdbci/cnf/mysql56/galera_server4.cnf b/system-test/mdbci/cnf/mysql56/galera_server4.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/mysql56/galera_server4.cnf rename to system-test/mdbci/cnf/mysql56/galera_server4.cnf diff --git a/maxscale-system-test/mdbci/cnf/mysql56/server1.cnf b/system-test/mdbci/cnf/mysql56/server1.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/mysql56/server1.cnf rename to system-test/mdbci/cnf/mysql56/server1.cnf diff --git a/maxscale-system-test/mdbci/cnf/mysql56/server10.cnf b/system-test/mdbci/cnf/mysql56/server10.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/mysql56/server10.cnf rename to system-test/mdbci/cnf/mysql56/server10.cnf diff --git a/maxscale-system-test/mdbci/cnf/mysql56/server11.cnf b/system-test/mdbci/cnf/mysql56/server11.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/mysql56/server11.cnf rename to system-test/mdbci/cnf/mysql56/server11.cnf diff --git a/maxscale-system-test/mdbci/cnf/mysql56/server12.cnf b/system-test/mdbci/cnf/mysql56/server12.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/mysql56/server12.cnf rename to system-test/mdbci/cnf/mysql56/server12.cnf diff --git a/maxscale-system-test/mdbci/cnf/mysql56/server13.cnf b/system-test/mdbci/cnf/mysql56/server13.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/mysql56/server13.cnf rename to system-test/mdbci/cnf/mysql56/server13.cnf diff --git a/maxscale-system-test/mdbci/cnf/mysql56/server14.cnf b/system-test/mdbci/cnf/mysql56/server14.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/mysql56/server14.cnf rename to system-test/mdbci/cnf/mysql56/server14.cnf diff --git a/maxscale-system-test/mdbci/cnf/mysql56/server15.cnf b/system-test/mdbci/cnf/mysql56/server15.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/mysql56/server15.cnf rename to system-test/mdbci/cnf/mysql56/server15.cnf diff --git a/maxscale-system-test/mdbci/cnf/mysql56/server2.cnf b/system-test/mdbci/cnf/mysql56/server2.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/mysql56/server2.cnf rename to system-test/mdbci/cnf/mysql56/server2.cnf diff --git a/maxscale-system-test/mdbci/cnf/mysql56/server3.cnf b/system-test/mdbci/cnf/mysql56/server3.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/mysql56/server3.cnf rename to system-test/mdbci/cnf/mysql56/server3.cnf diff --git a/maxscale-system-test/mdbci/cnf/mysql56/server4.cnf b/system-test/mdbci/cnf/mysql56/server4.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/mysql56/server4.cnf rename to system-test/mdbci/cnf/mysql56/server4.cnf diff --git a/maxscale-system-test/mdbci/cnf/mysql56/server5.cnf b/system-test/mdbci/cnf/mysql56/server5.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/mysql56/server5.cnf rename to system-test/mdbci/cnf/mysql56/server5.cnf diff --git a/maxscale-system-test/mdbci/cnf/mysql56/server6.cnf b/system-test/mdbci/cnf/mysql56/server6.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/mysql56/server6.cnf rename to system-test/mdbci/cnf/mysql56/server6.cnf diff --git a/maxscale-system-test/mdbci/cnf/mysql56/server7.cnf b/system-test/mdbci/cnf/mysql56/server7.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/mysql56/server7.cnf rename to system-test/mdbci/cnf/mysql56/server7.cnf diff --git a/maxscale-system-test/mdbci/cnf/mysql56/server8.cnf b/system-test/mdbci/cnf/mysql56/server8.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/mysql56/server8.cnf rename to system-test/mdbci/cnf/mysql56/server8.cnf diff --git a/maxscale-system-test/mdbci/cnf/mysql56/server9.cnf b/system-test/mdbci/cnf/mysql56/server9.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/mysql56/server9.cnf rename to system-test/mdbci/cnf/mysql56/server9.cnf diff --git a/maxscale-system-test/mdbci/cnf/server1.cnf b/system-test/mdbci/cnf/server1.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/server1.cnf rename to system-test/mdbci/cnf/server1.cnf diff --git a/maxscale-system-test/mdbci/cnf/server10.cnf b/system-test/mdbci/cnf/server10.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/server10.cnf rename to system-test/mdbci/cnf/server10.cnf diff --git a/maxscale-system-test/mdbci/cnf/server11.cnf b/system-test/mdbci/cnf/server11.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/server11.cnf rename to system-test/mdbci/cnf/server11.cnf diff --git a/maxscale-system-test/mdbci/cnf/server12.cnf b/system-test/mdbci/cnf/server12.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/server12.cnf rename to system-test/mdbci/cnf/server12.cnf diff --git a/maxscale-system-test/mdbci/cnf/server13.cnf b/system-test/mdbci/cnf/server13.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/server13.cnf rename to system-test/mdbci/cnf/server13.cnf diff --git a/maxscale-system-test/mdbci/cnf/server14.cnf b/system-test/mdbci/cnf/server14.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/server14.cnf rename to system-test/mdbci/cnf/server14.cnf diff --git a/maxscale-system-test/mdbci/cnf/server15.cnf b/system-test/mdbci/cnf/server15.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/server15.cnf rename to system-test/mdbci/cnf/server15.cnf diff --git a/maxscale-system-test/mdbci/cnf/server2.cnf b/system-test/mdbci/cnf/server2.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/server2.cnf rename to system-test/mdbci/cnf/server2.cnf diff --git a/maxscale-system-test/mdbci/cnf/server3.cnf b/system-test/mdbci/cnf/server3.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/server3.cnf rename to system-test/mdbci/cnf/server3.cnf diff --git a/maxscale-system-test/mdbci/cnf/server4.cnf b/system-test/mdbci/cnf/server4.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/server4.cnf rename to system-test/mdbci/cnf/server4.cnf diff --git a/maxscale-system-test/mdbci/cnf/server5.cnf b/system-test/mdbci/cnf/server5.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/server5.cnf rename to system-test/mdbci/cnf/server5.cnf diff --git a/maxscale-system-test/mdbci/cnf/server6.cnf b/system-test/mdbci/cnf/server6.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/server6.cnf rename to system-test/mdbci/cnf/server6.cnf diff --git a/maxscale-system-test/mdbci/cnf/server7.cnf b/system-test/mdbci/cnf/server7.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/server7.cnf rename to system-test/mdbci/cnf/server7.cnf diff --git a/maxscale-system-test/mdbci/cnf/server8.cnf b/system-test/mdbci/cnf/server8.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/server8.cnf rename to system-test/mdbci/cnf/server8.cnf diff --git a/maxscale-system-test/mdbci/cnf/server9.cnf b/system-test/mdbci/cnf/server9.cnf similarity index 100% rename from maxscale-system-test/mdbci/cnf/server9.cnf rename to system-test/mdbci/cnf/server9.cnf diff --git a/maxscale-system-test/mdbci/configure_log_dir.sh b/system-test/mdbci/configure_log_dir.sh similarity index 100% rename from maxscale-system-test/mdbci/configure_log_dir.sh rename to system-test/mdbci/configure_log_dir.sh diff --git a/maxscale-system-test/mdbci/copy_logs.sh b/system-test/mdbci/copy_logs.sh similarity index 100% rename from maxscale-system-test/mdbci/copy_logs.sh rename to system-test/mdbci/copy_logs.sh diff --git a/maxscale-system-test/mdbci/create_config.sh b/system-test/mdbci/create_config.sh similarity index 100% rename from maxscale-system-test/mdbci/create_config.sh rename to system-test/mdbci/create_config.sh diff --git a/maxscale-system-test/mdbci/mdbci_wrapper b/system-test/mdbci/mdbci_wrapper similarity index 100% rename from maxscale-system-test/mdbci/mdbci_wrapper rename to system-test/mdbci/mdbci_wrapper diff --git a/maxscale-system-test/mdbci/run_test.sh b/system-test/mdbci/run_test.sh similarity index 99% rename from maxscale-system-test/mdbci/run_test.sh rename to system-test/mdbci/run_test.sh index 61edba014..cf3ca18c9 100755 --- a/maxscale-system-test/mdbci/run_test.sh +++ b/system-test/mdbci/run_test.sh @@ -63,7 +63,7 @@ ulimit -c unlimited cd ${script_dir}/../../ mkdir build && cd build cmake .. -DBUILD_SYSTEM_TESTS=Y -DBUILDNAME=${mdbci_config_name} -DCMAKE_BUILD_TYPE=Debug -cd maxscale-system-test +cd system-test make echo ${test_set} | grep "NAME#" diff --git a/maxscale-system-test/mdbci/run_test_snapshot.sh b/system-test/mdbci/run_test_snapshot.sh similarity index 98% rename from maxscale-system-test/mdbci/run_test_snapshot.sh rename to system-test/mdbci/run_test_snapshot.sh index d05236a92..860952ea0 100755 --- a/maxscale-system-test/mdbci/run_test_snapshot.sh +++ b/system-test/mdbci/run_test_snapshot.sh @@ -66,7 +66,7 @@ rm -rf build mkdir build && cd build cmake .. -DBUILDNAME=$JOB_NAME-$BUILD_NUMBER-$target -DBUILD_SYSTEM_TESTS=Y -DCMAKE_BUILD_TYPE=Debug -cd maxscale-system-test +cd system-test make ./check_backend --restart-galera --reinstall-maxscale diff --git a/maxscale-system-test/mdbci/run_test_vm.sh b/system-test/mdbci/run_test_vm.sh similarity index 94% rename from maxscale-system-test/mdbci/run_test_vm.sh rename to system-test/mdbci/run_test_vm.sh index 8a63f73c1..227adc4ae 100755 --- a/maxscale-system-test/mdbci/run_test_vm.sh +++ b/system-test/mdbci/run_test_vm.sh @@ -90,13 +90,13 @@ scp -i $key $sshopt test_env $me@$ip:~/ ssh -i $key $sshopt $me@$ip "sudo usermod --shell /bin/bash $me" ssh -i $key $sshopt $me@$ip "./MaxScale/BUILD/install_test_build_deps.sh" -ssh -i $key $sshopt $me@$ip ". ./test_env; env; ./MaxScale/maxscale-system-test/mdbci/run_test.sh" +ssh -i $key $sshopt $me@$ip ". ./test_env; env; ./MaxScale/system-test/mdbci/run_test.sh" . ${script_dir}/configure_log_dir.sh mkdir -p LOGS mkdir -p ${logs_publish_dir} -scp -i $key $sshopt -r $me@$ip:./MaxScale/build/maxscale-system-test/LOGS/* LOGS/ +scp -i $key $sshopt -r $me@$ip:./MaxScale/build/system-test/LOGS/* LOGS/ cp core.* ${logs_publish_dir} diff --git a/maxscale-system-test/mdbci/set_env.sh b/system-test/mdbci/set_env.sh similarity index 100% rename from maxscale-system-test/mdbci/set_env.sh rename to system-test/mdbci/set_env.sh diff --git a/maxscale-system-test/mdbci/set_run_test_variables.sh b/system-test/mdbci/set_run_test_variables.sh similarity index 100% rename from maxscale-system-test/mdbci/set_run_test_variables.sh rename to system-test/mdbci/set_run_test_variables.sh diff --git a/maxscale-system-test/mdbci/templates/default.json.template b/system-test/mdbci/templates/default.json.template similarity index 100% rename from maxscale-system-test/mdbci/templates/default.json.template rename to system-test/mdbci/templates/default.json.template diff --git a/maxscale-system-test/mdbci/templates/performance.json.template b/system-test/mdbci/templates/performance.json.template similarity index 100% rename from maxscale-system-test/mdbci/templates/performance.json.template rename to system-test/mdbci/templates/performance.json.template diff --git a/maxscale-system-test/mdbci/test_vm.json b/system-test/mdbci/test_vm.json similarity index 100% rename from maxscale-system-test/mdbci/test_vm.json rename to system-test/mdbci/test_vm.json diff --git a/maxscale-system-test/mm.cpp b/system-test/mm.cpp similarity index 100% rename from maxscale-system-test/mm.cpp rename to system-test/mm.cpp diff --git a/maxscale-system-test/mrm/config1.toml b/system-test/mrm/config1.toml similarity index 100% rename from maxscale-system-test/mrm/config1.toml rename to system-test/mrm/config1.toml diff --git a/maxscale-system-test/mrm/config2.toml b/system-test/mrm/config2.toml similarity index 100% rename from maxscale-system-test/mrm/config2.toml rename to system-test/mrm/config2.toml diff --git a/maxscale-system-test/mxs1045.cpp b/system-test/mxs1045.cpp similarity index 100% rename from maxscale-system-test/mxs1045.cpp rename to system-test/mxs1045.cpp diff --git a/maxscale-system-test/mxs1071_maxrows.cpp b/system-test/mxs1071_maxrows.cpp similarity index 100% rename from maxscale-system-test/mxs1071_maxrows.cpp rename to system-test/mxs1071_maxrows.cpp diff --git a/maxscale-system-test/mxs1110_16mb.cpp b/system-test/mxs1110_16mb.cpp similarity index 100% rename from maxscale-system-test/mxs1110_16mb.cpp rename to system-test/mxs1110_16mb.cpp diff --git a/maxscale-system-test/mxs1113_schemarouter_ps.cpp b/system-test/mxs1113_schemarouter_ps.cpp similarity index 100% rename from maxscale-system-test/mxs1113_schemarouter_ps.cpp rename to system-test/mxs1113_schemarouter_ps.cpp diff --git a/maxscale-system-test/mxs1123.cpp b/system-test/mxs1123.cpp similarity index 100% rename from maxscale-system-test/mxs1123.cpp rename to system-test/mxs1123.cpp diff --git a/maxscale-system-test/mxs118.cpp b/system-test/mxs118.cpp similarity index 100% rename from maxscale-system-test/mxs118.cpp rename to system-test/mxs118.cpp diff --git a/maxscale-system-test/mxs1295_sp_call.cpp b/system-test/mxs1295_sp_call.cpp similarity index 100% rename from maxscale-system-test/mxs1295_sp_call.cpp rename to system-test/mxs1295_sp_call.cpp diff --git a/maxscale-system-test/mxs1310_implicit_db.cpp b/system-test/mxs1310_implicit_db.cpp similarity index 100% rename from maxscale-system-test/mxs1310_implicit_db.cpp rename to system-test/mxs1310_implicit_db.cpp diff --git a/maxscale-system-test/mxs1319.cpp b/system-test/mxs1319.cpp similarity index 100% rename from maxscale-system-test/mxs1319.cpp rename to system-test/mxs1319.cpp diff --git a/maxscale-system-test/mxs1323_retry_read.cpp b/system-test/mxs1323_retry_read.cpp similarity index 100% rename from maxscale-system-test/mxs1323_retry_read.cpp rename to system-test/mxs1323_retry_read.cpp diff --git a/maxscale-system-test/mxs1323_stress.cpp b/system-test/mxs1323_stress.cpp similarity index 100% rename from maxscale-system-test/mxs1323_stress.cpp rename to system-test/mxs1323_stress.cpp diff --git a/maxscale-system-test/mxs1418.cpp b/system-test/mxs1418.cpp similarity index 100% rename from maxscale-system-test/mxs1418.cpp rename to system-test/mxs1418.cpp diff --git a/maxscale-system-test/mxs1451_skip_auth.cpp b/system-test/mxs1451_skip_auth.cpp similarity index 100% rename from maxscale-system-test/mxs1451_skip_auth.cpp rename to system-test/mxs1451_skip_auth.cpp diff --git a/maxscale-system-test/mxs1457_ignore_deleted.cpp b/system-test/mxs1457_ignore_deleted.cpp similarity index 100% rename from maxscale-system-test/mxs1457_ignore_deleted.cpp rename to system-test/mxs1457_ignore_deleted.cpp diff --git a/maxscale-system-test/mxs1468.cpp b/system-test/mxs1468.cpp similarity index 100% rename from maxscale-system-test/mxs1468.cpp rename to system-test/mxs1468.cpp diff --git a/maxscale-system-test/mxs1476.cpp b/system-test/mxs1476.cpp similarity index 100% rename from maxscale-system-test/mxs1476.cpp rename to system-test/mxs1476.cpp diff --git a/maxscale-system-test/mxs1503_extra_slaves.cpp b/system-test/mxs1503_extra_slaves.cpp similarity index 100% rename from maxscale-system-test/mxs1503_extra_slaves.cpp rename to system-test/mxs1503_extra_slaves.cpp diff --git a/maxscale-system-test/mxs1503_master_reconnection.cpp b/system-test/mxs1503_master_reconnection.cpp similarity index 100% rename from maxscale-system-test/mxs1503_master_reconnection.cpp rename to system-test/mxs1503_master_reconnection.cpp diff --git a/maxscale-system-test/mxs1503_queued_sescmd.cpp b/system-test/mxs1503_queued_sescmd.cpp similarity index 100% rename from maxscale-system-test/mxs1503_queued_sescmd.cpp rename to system-test/mxs1503_queued_sescmd.cpp diff --git a/maxscale-system-test/mxs1506_delayed_retry.cpp b/system-test/mxs1506_delayed_retry.cpp similarity index 100% rename from maxscale-system-test/mxs1506_delayed_retry.cpp rename to system-test/mxs1506_delayed_retry.cpp diff --git a/maxscale-system-test/mxs1506_no_master.cpp b/system-test/mxs1506_no_master.cpp similarity index 100% rename from maxscale-system-test/mxs1506_no_master.cpp rename to system-test/mxs1506_no_master.cpp diff --git a/maxscale-system-test/mxs1507_inconsistent_trx.cpp b/system-test/mxs1507_inconsistent_trx.cpp similarity index 100% rename from maxscale-system-test/mxs1507_inconsistent_trx.cpp rename to system-test/mxs1507_inconsistent_trx.cpp diff --git a/maxscale-system-test/mxs1507_migrate_trx.cpp b/system-test/mxs1507_migrate_trx.cpp similarity index 100% rename from maxscale-system-test/mxs1507_migrate_trx.cpp rename to system-test/mxs1507_migrate_trx.cpp diff --git a/maxscale-system-test/mxs1507_trx_replay.cpp b/system-test/mxs1507_trx_replay.cpp similarity index 100% rename from maxscale-system-test/mxs1507_trx_replay.cpp rename to system-test/mxs1507_trx_replay.cpp diff --git a/maxscale-system-test/mxs1507_trx_stress.cpp b/system-test/mxs1507_trx_stress.cpp similarity index 100% rename from maxscale-system-test/mxs1507_trx_stress.cpp rename to system-test/mxs1507_trx_stress.cpp diff --git a/maxscale-system-test/mxs1509.cpp b/system-test/mxs1509.cpp similarity index 100% rename from maxscale-system-test/mxs1509.cpp rename to system-test/mxs1509.cpp diff --git a/maxscale-system-test/mxs1516.cpp b/system-test/mxs1516.cpp similarity index 100% rename from maxscale-system-test/mxs1516.cpp rename to system-test/mxs1516.cpp diff --git a/maxscale-system-test/mxs1542.cpp b/system-test/mxs1542.cpp similarity index 100% rename from maxscale-system-test/mxs1542.cpp rename to system-test/mxs1542.cpp diff --git a/maxscale-system-test/mxs1543.cpp b/system-test/mxs1543.cpp similarity index 100% rename from maxscale-system-test/mxs1543.cpp rename to system-test/mxs1543.cpp diff --git a/maxscale-system-test/mxs1549_optimistic_trx.cpp b/system-test/mxs1549_optimistic_trx.cpp similarity index 100% rename from maxscale-system-test/mxs1549_optimistic_trx.cpp rename to system-test/mxs1549_optimistic_trx.cpp diff --git a/maxscale-system-test/mxs1583_fwf.cpp b/system-test/mxs1583_fwf.cpp similarity index 100% rename from maxscale-system-test/mxs1583_fwf.cpp rename to system-test/mxs1583_fwf.cpp diff --git a/maxscale-system-test/mxs1585.cpp b/system-test/mxs1585.cpp similarity index 100% rename from maxscale-system-test/mxs1585.cpp rename to system-test/mxs1585.cpp diff --git a/maxscale-system-test/mxs1628_bad_handshake.cpp b/system-test/mxs1628_bad_handshake.cpp similarity index 100% rename from maxscale-system-test/mxs1628_bad_handshake.cpp rename to system-test/mxs1628_bad_handshake.cpp diff --git a/maxscale-system-test/mxs1643_extra_events.cpp b/system-test/mxs1643_extra_events.cpp similarity index 100% rename from maxscale-system-test/mxs1643_extra_events.cpp rename to system-test/mxs1643_extra_events.cpp diff --git a/maxscale-system-test/mxs1653_ps_hang.cpp b/system-test/mxs1653_ps_hang.cpp similarity index 100% rename from maxscale-system-test/mxs1653_ps_hang.cpp rename to system-test/mxs1653_ps_hang.cpp diff --git a/maxscale-system-test/mxs1677_temp_table.cpp b/system-test/mxs1677_temp_table.cpp similarity index 100% rename from maxscale-system-test/mxs1677_temp_table.cpp rename to system-test/mxs1677_temp_table.cpp diff --git a/maxscale-system-test/mxs1678_relay_master.cpp b/system-test/mxs1678_relay_master.cpp similarity index 100% rename from maxscale-system-test/mxs1678_relay_master.cpp rename to system-test/mxs1678_relay_master.cpp diff --git a/maxscale-system-test/mxs1713_lots_of_databases.cpp b/system-test/mxs1713_lots_of_databases.cpp similarity index 100% rename from maxscale-system-test/mxs1713_lots_of_databases.cpp rename to system-test/mxs1713_lots_of_databases.cpp diff --git a/maxscale-system-test/mxs1719.cpp b/system-test/mxs1719.cpp similarity index 100% rename from maxscale-system-test/mxs1719.cpp rename to system-test/mxs1719.cpp diff --git a/maxscale-system-test/mxs1719.json b/system-test/mxs1719.json similarity index 100% rename from maxscale-system-test/mxs1719.json rename to system-test/mxs1719.json diff --git a/maxscale-system-test/mxs1731_old_persisted_config.cpp b/system-test/mxs1731_old_persisted_config.cpp similarity index 100% rename from maxscale-system-test/mxs1731_old_persisted_config.cpp rename to system-test/mxs1731_old_persisted_config.cpp diff --git a/maxscale-system-test/mxs173_throttle_filter.cpp b/system-test/mxs173_throttle_filter.cpp similarity index 100% rename from maxscale-system-test/mxs173_throttle_filter.cpp rename to system-test/mxs173_throttle_filter.cpp diff --git a/maxscale-system-test/mxs1743_rconn_bitmask.cpp b/system-test/mxs1743_rconn_bitmask.cpp similarity index 100% rename from maxscale-system-test/mxs1743_rconn_bitmask.cpp rename to system-test/mxs1743_rconn_bitmask.cpp diff --git a/maxscale-system-test/mxs1751_available_when_donor_crash.cpp b/system-test/mxs1751_available_when_donor_crash.cpp similarity index 100% rename from maxscale-system-test/mxs1751_available_when_donor_crash.cpp rename to system-test/mxs1751_available_when_donor_crash.cpp diff --git a/maxscale-system-test/mxs1760_use_sql_variables_in.cpp b/system-test/mxs1760_use_sql_variables_in.cpp similarity index 100% rename from maxscale-system-test/mxs1760_use_sql_variables_in.cpp rename to system-test/mxs1760_use_sql_variables_in.cpp diff --git a/maxscale-system-test/mxs1773_failing_ldli.cpp b/system-test/mxs1773_failing_ldli.cpp similarity index 100% rename from maxscale-system-test/mxs1773_failing_ldli.cpp rename to system-test/mxs1773_failing_ldli.cpp diff --git a/maxscale-system-test/mxs1776_ps_exec_hang.cpp b/system-test/mxs1776_ps_exec_hang.cpp similarity index 100% rename from maxscale-system-test/mxs1776_ps_exec_hang.cpp rename to system-test/mxs1776_ps_exec_hang.cpp diff --git a/maxscale-system-test/mxs1778_causal_reads.cpp b/system-test/mxs1778_causal_reads.cpp similarity index 100% rename from maxscale-system-test/mxs1778_causal_reads.cpp rename to system-test/mxs1778_causal_reads.cpp diff --git a/maxscale-system-test/mxs1787_call_ps.cpp b/system-test/mxs1787_call_ps.cpp similarity index 100% rename from maxscale-system-test/mxs1787_call_ps.cpp rename to system-test/mxs1787_call_ps.cpp diff --git a/maxscale-system-test/mxs1787_slave_reconnection.cpp b/system-test/mxs1787_slave_reconnection.cpp similarity index 100% rename from maxscale-system-test/mxs1787_slave_reconnection.cpp rename to system-test/mxs1787_slave_reconnection.cpp diff --git a/maxscale-system-test/mxs1804_long_ps_hang.cpp b/system-test/mxs1804_long_ps_hang.cpp similarity index 100% rename from maxscale-system-test/mxs1804_long_ps_hang.cpp rename to system-test/mxs1804_long_ps_hang.cpp diff --git a/maxscale-system-test/mxs1808_long_data.cpp b/system-test/mxs1808_long_data.cpp similarity index 100% rename from maxscale-system-test/mxs1808_long_data.cpp rename to system-test/mxs1808_long_data.cpp diff --git a/maxscale-system-test/mxs1824_double_cursor.cpp b/system-test/mxs1824_double_cursor.cpp similarity index 100% rename from maxscale-system-test/mxs1824_double_cursor.cpp rename to system-test/mxs1824_double_cursor.cpp diff --git a/maxscale-system-test/mxs1828_double_local_infile.cpp b/system-test/mxs1828_double_local_infile.cpp similarity index 100% rename from maxscale-system-test/mxs1828_double_local_infile.cpp rename to system-test/mxs1828_double_local_infile.cpp diff --git a/maxscale-system-test/mxs1831_unknown_param.cpp b/system-test/mxs1831_unknown_param.cpp similarity index 100% rename from maxscale-system-test/mxs1831_unknown_param.cpp rename to system-test/mxs1831_unknown_param.cpp diff --git a/maxscale-system-test/mxs1836_show_eventTimes.cpp b/system-test/mxs1836_show_eventTimes.cpp similarity index 100% rename from maxscale-system-test/mxs1836_show_eventTimes.cpp rename to system-test/mxs1836_show_eventTimes.cpp diff --git a/maxscale-system-test/mxs1849_table_sharding.cpp b/system-test/mxs1849_table_sharding.cpp similarity index 100% rename from maxscale-system-test/mxs1849_table_sharding.cpp rename to system-test/mxs1849_table_sharding.cpp diff --git a/maxscale-system-test/mxs1873_large_sescmd.cpp b/system-test/mxs1873_large_sescmd.cpp similarity index 100% rename from maxscale-system-test/mxs1873_large_sescmd.cpp rename to system-test/mxs1873_large_sescmd.cpp diff --git a/maxscale-system-test/mxs1889.cpp b/system-test/mxs1889.cpp similarity index 100% rename from maxscale-system-test/mxs1889.cpp rename to system-test/mxs1889.cpp diff --git a/maxscale-system-test/mxs1896_load_data_infile.cpp b/system-test/mxs1896_load_data_infile.cpp similarity index 100% rename from maxscale-system-test/mxs1896_load_data_infile.cpp rename to system-test/mxs1896_load_data_infile.cpp diff --git a/maxscale-system-test/mxs1899_generated_cnf.cpp b/system-test/mxs1899_generated_cnf.cpp similarity index 100% rename from maxscale-system-test/mxs1899_generated_cnf.cpp rename to system-test/mxs1899_generated_cnf.cpp diff --git a/maxscale-system-test/mxs1926_killed_server.cpp b/system-test/mxs1926_killed_server.cpp similarity index 100% rename from maxscale-system-test/mxs1926_killed_server.cpp rename to system-test/mxs1926_killed_server.cpp diff --git a/maxscale-system-test/mxs1929_filter_runtime.cpp b/system-test/mxs1929_filter_runtime.cpp similarity index 100% rename from maxscale-system-test/mxs1929_filter_runtime.cpp rename to system-test/mxs1929_filter_runtime.cpp diff --git a/maxscale-system-test/mxs1929_service_runtime.cpp b/system-test/mxs1929_service_runtime.cpp similarity index 100% rename from maxscale-system-test/mxs1929_service_runtime.cpp rename to system-test/mxs1929_service_runtime.cpp diff --git a/maxscale-system-test/mxs1929_start_from_scratch.cpp b/system-test/mxs1929_start_from_scratch.cpp similarity index 100% rename from maxscale-system-test/mxs1929_start_from_scratch.cpp rename to system-test/mxs1929_start_from_scratch.cpp diff --git a/maxscale-system-test/mxs1932_hidden_cnf.cpp b/system-test/mxs1932_hidden_cnf.cpp similarity index 100% rename from maxscale-system-test/mxs1932_hidden_cnf.cpp rename to system-test/mxs1932_hidden_cnf.cpp diff --git a/maxscale-system-test/mxs1947_composite_roles.cpp b/system-test/mxs1947_composite_roles.cpp similarity index 100% rename from maxscale-system-test/mxs1947_composite_roles.cpp rename to system-test/mxs1947_composite_roles.cpp diff --git a/maxscale-system-test/mxs1949_warn_user_injection.cpp b/system-test/mxs1949_warn_user_injection.cpp similarity index 100% rename from maxscale-system-test/mxs1949_warn_user_injection.cpp rename to system-test/mxs1949_warn_user_injection.cpp diff --git a/maxscale-system-test/mxs1958_insert_priv.cpp b/system-test/mxs1958_insert_priv.cpp similarity index 100% rename from maxscale-system-test/mxs1958_insert_priv.cpp rename to system-test/mxs1958_insert_priv.cpp diff --git a/maxscale-system-test/mxs1961_standalone_rejoin.cpp b/system-test/mxs1961_standalone_rejoin.cpp similarity index 100% rename from maxscale-system-test/mxs1961_standalone_rejoin.cpp rename to system-test/mxs1961_standalone_rejoin.cpp diff --git a/maxscale-system-test/mxs1980_blr_galera_server_ids.cpp b/system-test/mxs1980_blr_galera_server_ids.cpp similarity index 100% rename from maxscale-system-test/mxs1980_blr_galera_server_ids.cpp rename to system-test/mxs1980_blr_galera_server_ids.cpp diff --git a/maxscale-system-test/mxs1985_kill_hang.cpp b/system-test/mxs1985_kill_hang.cpp similarity index 100% rename from maxscale-system-test/mxs1985_kill_hang.cpp rename to system-test/mxs1985_kill_hang.cpp diff --git a/maxscale-system-test/mxs2037_namedserver_wildcards.cpp b/system-test/mxs2037_namedserver_wildcards.cpp similarity index 100% rename from maxscale-system-test/mxs2037_namedserver_wildcards.cpp rename to system-test/mxs2037_namedserver_wildcards.cpp diff --git a/maxscale-system-test/mxs2043_select_for_update.cpp b/system-test/mxs2043_select_for_update.cpp similarity index 100% rename from maxscale-system-test/mxs2043_select_for_update.cpp rename to system-test/mxs2043_select_for_update.cpp diff --git a/maxscale-system-test/mxs2054_hybrid_cluster.cpp b/system-test/mxs2054_hybrid_cluster.cpp similarity index 100% rename from maxscale-system-test/mxs2054_hybrid_cluster.cpp rename to system-test/mxs2054_hybrid_cluster.cpp diff --git a/maxscale-system-test/mxs2057_systemd_watchdog.cpp b/system-test/mxs2057_systemd_watchdog.cpp similarity index 100% rename from maxscale-system-test/mxs2057_systemd_watchdog.cpp rename to system-test/mxs2057_systemd_watchdog.cpp diff --git a/maxscale-system-test/mxs2106_avro_null.cpp b/system-test/mxs2106_avro_null.cpp similarity index 100% rename from maxscale-system-test/mxs2106_avro_null.cpp rename to system-test/mxs2106_avro_null.cpp diff --git a/maxscale-system-test/mxs2111_auth_string.cpp b/system-test/mxs2111_auth_string.cpp similarity index 100% rename from maxscale-system-test/mxs2111_auth_string.cpp rename to system-test/mxs2111_auth_string.cpp diff --git a/maxscale-system-test/mxs2115_version_string.cpp b/system-test/mxs2115_version_string.cpp similarity index 100% rename from maxscale-system-test/mxs2115_version_string.cpp rename to system-test/mxs2115_version_string.cpp diff --git a/maxscale-system-test/mxs2167_extra_port.cpp b/system-test/mxs2167_extra_port.cpp similarity index 100% rename from maxscale-system-test/mxs2167_extra_port.cpp rename to system-test/mxs2167_extra_port.cpp diff --git a/maxscale-system-test/mxs2187_multi_replay.cpp b/system-test/mxs2187_multi_replay.cpp similarity index 100% rename from maxscale-system-test/mxs2187_multi_replay.cpp rename to system-test/mxs2187_multi_replay.cpp diff --git a/maxscale-system-test/mxs2250_describe_temp_table.cpp b/system-test/mxs2250_describe_temp_table.cpp similarity index 100% rename from maxscale-system-test/mxs2250_describe_temp_table.cpp rename to system-test/mxs2250_describe_temp_table.cpp diff --git a/maxscale-system-test/mxs2295_change_user_loop.cpp b/system-test/mxs2295_change_user_loop.cpp similarity index 100% rename from maxscale-system-test/mxs2295_change_user_loop.cpp rename to system-test/mxs2295_change_user_loop.cpp diff --git a/maxscale-system-test/mxs2300_history_pruning.cpp b/system-test/mxs2300_history_pruning.cpp similarity index 100% rename from maxscale-system-test/mxs2300_history_pruning.cpp rename to system-test/mxs2300_history_pruning.cpp diff --git a/maxscale-system-test/mxs2326_hint_clone.cpp b/system-test/mxs2326_hint_clone.cpp similarity index 100% rename from maxscale-system-test/mxs2326_hint_clone.cpp rename to system-test/mxs2326_hint_clone.cpp diff --git a/maxscale-system-test/mxs2355_wrong_auth.cpp b/system-test/mxs2355_wrong_auth.cpp similarity index 100% rename from maxscale-system-test/mxs2355_wrong_auth.cpp rename to system-test/mxs2355_wrong_auth.cpp diff --git a/maxscale-system-test/mxs2417_ignore_persisted_cnf.cpp b/system-test/mxs2417_ignore_persisted_cnf.cpp similarity index 100% rename from maxscale-system-test/mxs2417_ignore_persisted_cnf.cpp rename to system-test/mxs2417_ignore_persisted_cnf.cpp diff --git a/maxscale-system-test/mxs244_prepared_stmt_loop.cpp b/system-test/mxs244_prepared_stmt_loop.cpp similarity index 100% rename from maxscale-system-test/mxs244_prepared_stmt_loop.cpp rename to system-test/mxs244_prepared_stmt_loop.cpp diff --git a/maxscale-system-test/mxs2450_change_user_crash.cpp b/system-test/mxs2450_change_user_crash.cpp similarity index 100% rename from maxscale-system-test/mxs2450_change_user_crash.cpp rename to system-test/mxs2450_change_user_crash.cpp diff --git a/maxscale-system-test/mxs2464_sescmd_reconnect.cpp b/system-test/mxs2464_sescmd_reconnect.cpp similarity index 100% rename from maxscale-system-test/mxs2464_sescmd_reconnect.cpp rename to system-test/mxs2464_sescmd_reconnect.cpp diff --git a/maxscale-system-test/mxs2490_ps_execute_direct.cpp b/system-test/mxs2490_ps_execute_direct.cpp similarity index 100% rename from maxscale-system-test/mxs2490_ps_execute_direct.cpp rename to system-test/mxs2490_ps_execute_direct.cpp diff --git a/maxscale-system-test/mxs2520_master_read_reconnect.cpp b/system-test/mxs2520_master_read_reconnect.cpp similarity index 100% rename from maxscale-system-test/mxs2520_master_read_reconnect.cpp rename to system-test/mxs2520_master_read_reconnect.cpp diff --git a/maxscale-system-test/mxs2521_double_exec.cpp b/system-test/mxs2521_double_exec.cpp similarity index 100% rename from maxscale-system-test/mxs2521_double_exec.cpp rename to system-test/mxs2521_double_exec.cpp diff --git a/maxscale-system-test/mxs2563_concurrent_slave_failure.cpp b/system-test/mxs2563_concurrent_slave_failure.cpp similarity index 100% rename from maxscale-system-test/mxs2563_concurrent_slave_failure.cpp rename to system-test/mxs2563_concurrent_slave_failure.cpp diff --git a/maxscale-system-test/mxs2609_history_replay.cpp b/system-test/mxs2609_history_replay.cpp similarity index 100% rename from maxscale-system-test/mxs2609_history_replay.cpp rename to system-test/mxs2609_history_replay.cpp diff --git a/maxscale-system-test/mxs2621_lower_case_tables.cpp b/system-test/mxs2621_lower_case_tables.cpp similarity index 100% rename from maxscale-system-test/mxs2621_lower_case_tables.cpp rename to system-test/mxs2621_lower_case_tables.cpp diff --git a/maxscale-system-test/mxs2631_ignore_system_tables.cpp b/system-test/mxs2631_ignore_system_tables.cpp similarity index 100% rename from maxscale-system-test/mxs2631_ignore_system_tables.cpp rename to system-test/mxs2631_ignore_system_tables.cpp diff --git a/maxscale-system-test/mxs280_select_outfile.cpp b/system-test/mxs280_select_outfile.cpp similarity index 100% rename from maxscale-system-test/mxs280_select_outfile.cpp rename to system-test/mxs280_select_outfile.cpp diff --git a/maxscale-system-test/mxs2878_monitor_ssl.cpp b/system-test/mxs2878_monitor_ssl.cpp similarity index 100% rename from maxscale-system-test/mxs2878_monitor_ssl.cpp rename to system-test/mxs2878_monitor_ssl.cpp diff --git a/maxscale-system-test/mxs314.cpp b/system-test/mxs314.cpp similarity index 100% rename from maxscale-system-test/mxs314.cpp rename to system-test/mxs314.cpp diff --git a/maxscale-system-test/mxs321.cpp b/system-test/mxs321.cpp similarity index 100% rename from maxscale-system-test/mxs321.cpp rename to system-test/mxs321.cpp diff --git a/maxscale-system-test/mxs359_error_on_write.cpp b/system-test/mxs359_error_on_write.cpp similarity index 100% rename from maxscale-system-test/mxs359_error_on_write.cpp rename to system-test/mxs359_error_on_write.cpp diff --git a/maxscale-system-test/mxs359_master_switch.cpp b/system-test/mxs359_master_switch.cpp similarity index 100% rename from maxscale-system-test/mxs359_master_switch.cpp rename to system-test/mxs359_master_switch.cpp diff --git a/maxscale-system-test/mxs359_read_only.cpp b/system-test/mxs359_read_only.cpp similarity index 100% rename from maxscale-system-test/mxs359_read_only.cpp rename to system-test/mxs359_read_only.cpp diff --git a/maxscale-system-test/mxs365.cpp b/system-test/mxs365.cpp similarity index 100% rename from maxscale-system-test/mxs365.cpp rename to system-test/mxs365.cpp diff --git a/maxscale-system-test/mxs37_table_privilege.cpp b/system-test/mxs37_table_privilege.cpp similarity index 100% rename from maxscale-system-test/mxs37_table_privilege.cpp rename to system-test/mxs37_table_privilege.cpp diff --git a/maxscale-system-test/mxs421_events.cpp b/system-test/mxs421_events.cpp similarity index 100% rename from maxscale-system-test/mxs421_events.cpp rename to system-test/mxs421_events.cpp diff --git a/maxscale-system-test/mxs431.cpp b/system-test/mxs431.cpp similarity index 100% rename from maxscale-system-test/mxs431.cpp rename to system-test/mxs431.cpp diff --git a/maxscale-system-test/mxs548_short_session_change_user.cpp b/system-test/mxs548_short_session_change_user.cpp similarity index 100% rename from maxscale-system-test/mxs548_short_session_change_user.cpp rename to system-test/mxs548_short_session_change_user.cpp diff --git a/maxscale-system-test/mxs559_block_master.cpp b/system-test/mxs559_block_master.cpp similarity index 100% rename from maxscale-system-test/mxs559_block_master.cpp rename to system-test/mxs559_block_master.cpp diff --git a/maxscale-system-test/mxs564_big_dump.cpp b/system-test/mxs564_big_dump.cpp similarity index 100% rename from maxscale-system-test/mxs564_big_dump.cpp rename to system-test/mxs564_big_dump.cpp diff --git a/maxscale-system-test/mxs585.py b/system-test/mxs585.py similarity index 100% rename from maxscale-system-test/mxs585.py rename to system-test/mxs585.py diff --git a/maxscale-system-test/mxs598.py b/system-test/mxs598.py similarity index 100% rename from maxscale-system-test/mxs598.py rename to system-test/mxs598.py diff --git a/maxscale-system-test/mxs621_unreadable_cnf.cpp b/system-test/mxs621_unreadable_cnf.cpp similarity index 100% rename from maxscale-system-test/mxs621_unreadable_cnf.cpp rename to system-test/mxs621_unreadable_cnf.cpp diff --git a/maxscale-system-test/mxs657_restart.cpp b/system-test/mxs657_restart.cpp similarity index 100% rename from maxscale-system-test/mxs657_restart.cpp rename to system-test/mxs657_restart.cpp diff --git a/maxscale-system-test/mxs657_restart_service.cpp b/system-test/mxs657_restart_service.cpp similarity index 100% rename from maxscale-system-test/mxs657_restart_service.cpp rename to system-test/mxs657_restart_service.cpp diff --git a/maxscale-system-test/mxs682_cyrillic.cpp b/system-test/mxs682_cyrillic.cpp similarity index 100% rename from maxscale-system-test/mxs682_cyrillic.cpp rename to system-test/mxs682_cyrillic.cpp diff --git a/maxscale-system-test/mxs701_binlog_filter.cpp b/system-test/mxs701_binlog_filter.cpp similarity index 100% rename from maxscale-system-test/mxs701_binlog_filter.cpp rename to system-test/mxs701_binlog_filter.cpp diff --git a/maxscale-system-test/mxs716.cpp b/system-test/mxs716.cpp similarity index 100% rename from maxscale-system-test/mxs716.cpp rename to system-test/mxs716.cpp diff --git a/maxscale-system-test/mxs722.cpp b/system-test/mxs722.cpp similarity index 100% rename from maxscale-system-test/mxs722.cpp rename to system-test/mxs722.cpp diff --git a/maxscale-system-test/mxs729_maxadmin.cpp b/system-test/mxs729_maxadmin.cpp similarity index 100% rename from maxscale-system-test/mxs729_maxadmin.cpp rename to system-test/mxs729_maxadmin.cpp diff --git a/maxscale-system-test/mxs781_binlog_wrong_passwrd.cpp b/system-test/mxs781_binlog_wrong_passwrd.cpp similarity index 100% rename from maxscale-system-test/mxs781_binlog_wrong_passwrd.cpp rename to system-test/mxs781_binlog_wrong_passwrd.cpp diff --git a/maxscale-system-test/mxs791.sh b/system-test/mxs791.sh similarity index 100% rename from maxscale-system-test/mxs791.sh rename to system-test/mxs791.sh diff --git a/maxscale-system-test/mxs791_base.sh b/system-test/mxs791_base.sh similarity index 100% rename from maxscale-system-test/mxs791_base.sh rename to system-test/mxs791_base.sh diff --git a/maxscale-system-test/mxs812_1.cpp b/system-test/mxs812_1.cpp similarity index 100% rename from maxscale-system-test/mxs812_1.cpp rename to system-test/mxs812_1.cpp diff --git a/maxscale-system-test/mxs812_2.cpp b/system-test/mxs812_2.cpp similarity index 100% rename from maxscale-system-test/mxs812_2.cpp rename to system-test/mxs812_2.cpp diff --git a/maxscale-system-test/mxs813_long_hostname.cpp b/system-test/mxs813_long_hostname.cpp similarity index 100% rename from maxscale-system-test/mxs813_long_hostname.cpp rename to system-test/mxs813_long_hostname.cpp diff --git a/maxscale-system-test/mxs822_maxpasswd.cpp b/system-test/mxs822_maxpasswd.cpp similarity index 100% rename from maxscale-system-test/mxs822_maxpasswd.cpp rename to system-test/mxs822_maxpasswd.cpp diff --git a/maxscale-system-test/mxs827_write_timeout.cpp b/system-test/mxs827_write_timeout.cpp similarity index 100% rename from maxscale-system-test/mxs827_write_timeout.cpp rename to system-test/mxs827_write_timeout.cpp diff --git a/maxscale-system-test/mxs872_roles.cpp b/system-test/mxs872_roles.cpp similarity index 100% rename from maxscale-system-test/mxs872_roles.cpp rename to system-test/mxs872_roles.cpp diff --git a/maxscale-system-test/mxs874_slave_recovery.cpp b/system-test/mxs874_slave_recovery.cpp similarity index 100% rename from maxscale-system-test/mxs874_slave_recovery.cpp rename to system-test/mxs874_slave_recovery.cpp diff --git a/maxscale-system-test/mxs922_bad_server.cpp b/system-test/mxs922_bad_server.cpp similarity index 100% rename from maxscale-system-test/mxs922_bad_server.cpp rename to system-test/mxs922_bad_server.cpp diff --git a/maxscale-system-test/mxs922_double_listener.cpp b/system-test/mxs922_double_listener.cpp similarity index 100% rename from maxscale-system-test/mxs922_double_listener.cpp rename to system-test/mxs922_double_listener.cpp diff --git a/maxscale-system-test/mxs922_listener_ssl.cpp b/system-test/mxs922_listener_ssl.cpp similarity index 100% rename from maxscale-system-test/mxs922_listener_ssl.cpp rename to system-test/mxs922_listener_ssl.cpp diff --git a/maxscale-system-test/mxs922_monitor.cpp b/system-test/mxs922_monitor.cpp similarity index 100% rename from maxscale-system-test/mxs922_monitor.cpp rename to system-test/mxs922_monitor.cpp diff --git a/maxscale-system-test/mxs922_restart.cpp b/system-test/mxs922_restart.cpp similarity index 100% rename from maxscale-system-test/mxs922_restart.cpp rename to system-test/mxs922_restart.cpp diff --git a/maxscale-system-test/mxs922_scaling.cpp b/system-test/mxs922_scaling.cpp similarity index 100% rename from maxscale-system-test/mxs922_scaling.cpp rename to system-test/mxs922_scaling.cpp diff --git a/maxscale-system-test/mxs922_server.cpp b/system-test/mxs922_server.cpp similarity index 100% rename from maxscale-system-test/mxs922_server.cpp rename to system-test/mxs922_server.cpp diff --git a/maxscale-system-test/mxs951_utfmb4.cpp b/system-test/mxs951_utfmb4.cpp similarity index 100% rename from maxscale-system-test/mxs951_utfmb4.cpp rename to system-test/mxs951_utfmb4.cpp diff --git a/maxscale-system-test/mysqltest_driver.sh b/system-test/mysqltest_driver.sh similarity index 100% rename from maxscale-system-test/mysqltest_driver.sh rename to system-test/mysqltest_driver.sh diff --git a/maxscale-system-test/namedserverfilter.cpp b/system-test/namedserverfilter.cpp similarity index 100% rename from maxscale-system-test/namedserverfilter.cpp rename to system-test/namedserverfilter.cpp diff --git a/maxscale-system-test/no_backends_crash.cpp b/system-test/no_backends_crash.cpp similarity index 100% rename from maxscale-system-test/no_backends_crash.cpp rename to system-test/no_backends_crash.cpp diff --git a/maxscale-system-test/no_password.cpp b/system-test/no_password.cpp similarity index 100% rename from maxscale-system-test/no_password.cpp rename to system-test/no_password.cpp diff --git a/maxscale-system-test/non_native_setup.cpp b/system-test/non_native_setup.cpp similarity index 100% rename from maxscale-system-test/non_native_setup.cpp rename to system-test/non_native_setup.cpp diff --git a/maxscale-system-test/nsfilter.py b/system-test/nsfilter.py similarity index 100% rename from maxscale-system-test/nsfilter.py rename to system-test/nsfilter.py diff --git a/maxscale-system-test/open_close_connections.cpp b/system-test/open_close_connections.cpp similarity index 100% rename from maxscale-system-test/open_close_connections.cpp rename to system-test/open_close_connections.cpp diff --git a/maxscale-system-test/pam_authentication.cpp b/system-test/pam_authentication.cpp similarity index 100% rename from maxscale-system-test/pam_authentication.cpp rename to system-test/pam_authentication.cpp diff --git a/maxscale-system-test/pers_01.cpp b/system-test/pers_01.cpp similarity index 100% rename from maxscale-system-test/pers_01.cpp rename to system-test/pers_01.cpp diff --git a/maxscale-system-test/pers_02.cpp b/system-test/pers_02.cpp similarity index 100% rename from maxscale-system-test/pers_02.cpp rename to system-test/pers_02.cpp diff --git a/maxscale-system-test/prepared_statement.cpp b/system-test/prepared_statement.cpp similarity index 100% rename from maxscale-system-test/prepared_statement.cpp rename to system-test/prepared_statement.cpp diff --git a/maxscale-system-test/proxy_protocol.cpp b/system-test/proxy_protocol.cpp similarity index 100% rename from maxscale-system-test/proxy_protocol.cpp rename to system-test/proxy_protocol.cpp diff --git a/maxscale-system-test/readconnrouter_master.cpp b/system-test/readconnrouter_master.cpp similarity index 100% rename from maxscale-system-test/readconnrouter_master.cpp rename to system-test/readconnrouter_master.cpp diff --git a/maxscale-system-test/readconnrouter_slave.cpp b/system-test/readconnrouter_slave.cpp similarity index 100% rename from maxscale-system-test/readconnrouter_slave.cpp rename to system-test/readconnrouter_slave.cpp diff --git a/maxscale-system-test/regexf_replace.cpp b/system-test/regexf_replace.cpp similarity index 100% rename from maxscale-system-test/regexf_replace.cpp rename to system-test/regexf_replace.cpp diff --git a/maxscale-system-test/regexf_replace_crash.cpp b/system-test/regexf_replace_crash.cpp similarity index 100% rename from maxscale-system-test/regexf_replace_crash.cpp rename to system-test/regexf_replace_crash.cpp diff --git a/maxscale-system-test/regexfilter1.cpp b/system-test/regexfilter1.cpp similarity index 100% rename from maxscale-system-test/regexfilter1.cpp rename to system-test/regexfilter1.cpp diff --git a/maxscale-system-test/rhint_basic.cpp b/system-test/rhint_basic.cpp similarity index 100% rename from maxscale-system-test/rhint_basic.cpp rename to system-test/rhint_basic.cpp diff --git a/maxscale-system-test/rhint_comment.cpp b/system-test/rhint_comment.cpp similarity index 100% rename from maxscale-system-test/rhint_comment.cpp rename to system-test/rhint_comment.cpp diff --git a/maxscale-system-test/rhint_crash.cpp b/system-test/rhint_crash.cpp similarity index 100% rename from maxscale-system-test/rhint_crash.cpp rename to system-test/rhint_crash.cpp diff --git a/maxscale-system-test/router_conn_num.cpp b/system-test/router_conn_num.cpp similarity index 100% rename from maxscale-system-test/router_conn_num.cpp rename to system-test/router_conn_num.cpp diff --git a/maxscale-system-test/router_slaves_blocked.cpp b/system-test/router_slaves_blocked.cpp similarity index 100% rename from maxscale-system-test/router_slaves_blocked.cpp rename to system-test/router_slaves_blocked.cpp diff --git a/maxscale-system-test/run_ctrl_c.sh b/system-test/run_ctrl_c.sh similarity index 100% rename from maxscale-system-test/run_ctrl_c.sh rename to system-test/run_ctrl_c.sh diff --git a/maxscale-system-test/run_session_hang.sh b/system-test/run_session_hang.sh similarity index 100% rename from maxscale-system-test/run_session_hang.sh rename to system-test/run_session_hang.sh diff --git a/maxscale-system-test/rw_select_insert.cpp b/system-test/rw_select_insert.cpp similarity index 100% rename from maxscale-system-test/rw_select_insert.cpp rename to system-test/rw_select_insert.cpp diff --git a/maxscale-system-test/rwsplit_conn_num.cpp b/system-test/rwsplit_conn_num.cpp similarity index 100% rename from maxscale-system-test/rwsplit_conn_num.cpp rename to system-test/rwsplit_conn_num.cpp diff --git a/maxscale-system-test/rwsplit_connect.cpp b/system-test/rwsplit_connect.cpp similarity index 100% rename from maxscale-system-test/rwsplit_connect.cpp rename to system-test/rwsplit_connect.cpp diff --git a/maxscale-system-test/rwsplit_infile_outfile.cpp b/system-test/rwsplit_infile_outfile.cpp similarity index 100% rename from maxscale-system-test/rwsplit_infile_outfile.cpp rename to system-test/rwsplit_infile_outfile.cpp diff --git a/maxscale-system-test/rwsplit_multi_stmt.cpp b/system-test/rwsplit_multi_stmt.cpp similarity index 100% rename from maxscale-system-test/rwsplit_multi_stmt.cpp rename to system-test/rwsplit_multi_stmt.cpp diff --git a/maxscale-system-test/rwsplit_not_enough_servers.cpp b/system-test/rwsplit_not_enough_servers.cpp similarity index 100% rename from maxscale-system-test/rwsplit_not_enough_servers.cpp rename to system-test/rwsplit_not_enough_servers.cpp diff --git a/maxscale-system-test/rwsplit_php_stmt.cpp b/system-test/rwsplit_php_stmt.cpp similarity index 100% rename from maxscale-system-test/rwsplit_php_stmt.cpp rename to system-test/rwsplit_php_stmt.cpp diff --git a/maxscale-system-test/rwsplit_php_stmt.php b/system-test/rwsplit_php_stmt.php similarity index 100% rename from maxscale-system-test/rwsplit_php_stmt.php rename to system-test/rwsplit_php_stmt.php diff --git a/maxscale-system-test/rwsplit_readonly.cpp b/system-test/rwsplit_readonly.cpp similarity index 100% rename from maxscale-system-test/rwsplit_readonly.cpp rename to system-test/rwsplit_readonly.cpp diff --git a/maxscale-system-test/rwsplit_readonly_stress.cpp b/system-test/rwsplit_readonly_stress.cpp similarity index 100% rename from maxscale-system-test/rwsplit_readonly_stress.cpp rename to system-test/rwsplit_readonly_stress.cpp diff --git a/maxscale-system-test/sanity_check.cpp b/system-test/sanity_check.cpp similarity index 100% rename from maxscale-system-test/sanity_check.cpp rename to system-test/sanity_check.cpp diff --git a/maxscale-system-test/schemarouter_duplicate.cpp b/system-test/schemarouter_duplicate.cpp similarity index 100% rename from maxscale-system-test/schemarouter_duplicate.cpp rename to system-test/schemarouter_duplicate.cpp diff --git a/maxscale-system-test/script.cpp b/system-test/script.cpp similarity index 100% rename from maxscale-system-test/script.cpp rename to system-test/script.cpp diff --git a/maxscale-system-test/sequence.cpp b/system-test/sequence.cpp similarity index 100% rename from maxscale-system-test/sequence.cpp rename to system-test/sequence.cpp diff --git a/maxscale-system-test/server_weight.cpp b/system-test/server_weight.cpp similarity index 100% rename from maxscale-system-test/server_weight.cpp rename to system-test/server_weight.cpp diff --git a/maxscale-system-test/session_hang/run_setmix.sh b/system-test/session_hang/run_setmix.sh similarity index 100% rename from maxscale-system-test/session_hang/run_setmix.sh rename to system-test/session_hang/run_setmix.sh diff --git a/maxscale-system-test/session_hang/setmix.sql b/system-test/session_hang/setmix.sql similarity index 100% rename from maxscale-system-test/session_hang/setmix.sql rename to system-test/session_hang/setmix.sql diff --git a/maxscale-system-test/session_hang/simpletest.pl b/system-test/session_hang/simpletest.pl similarity index 100% rename from maxscale-system-test/session_hang/simpletest.pl rename to system-test/session_hang/simpletest.pl diff --git a/maxscale-system-test/session_limits.cpp b/system-test/session_limits.cpp similarity index 100% rename from maxscale-system-test/session_limits.cpp rename to system-test/session_limits.cpp diff --git a/maxscale-system-test/setup_binlog.cpp b/system-test/setup_binlog.cpp similarity index 100% rename from maxscale-system-test/setup_binlog.cpp rename to system-test/setup_binlog.cpp diff --git a/maxscale-system-test/setup_binlog_gtid.cpp b/system-test/setup_binlog_gtid.cpp similarity index 100% rename from maxscale-system-test/setup_binlog_gtid.cpp rename to system-test/setup_binlog_gtid.cpp diff --git a/maxscale-system-test/sharding.cpp b/system-test/sharding.cpp similarity index 100% rename from maxscale-system-test/sharding.cpp rename to system-test/sharding.cpp diff --git a/maxscale-system-test/sharding_load_data.cpp b/system-test/sharding_load_data.cpp similarity index 100% rename from maxscale-system-test/sharding_load_data.cpp rename to system-test/sharding_load_data.cpp diff --git a/maxscale-system-test/short_sessions.cpp b/system-test/short_sessions.cpp similarity index 100% rename from maxscale-system-test/short_sessions.cpp rename to system-test/short_sessions.cpp diff --git a/maxscale-system-test/show_monitor_crash.cpp b/system-test/show_monitor_crash.cpp similarity index 100% rename from maxscale-system-test/show_monitor_crash.cpp rename to system-test/show_monitor_crash.cpp diff --git a/maxscale-system-test/slave_failover.cpp b/system-test/slave_failover.cpp similarity index 100% rename from maxscale-system-test/slave_failover.cpp rename to system-test/slave_failover.cpp diff --git a/maxscale-system-test/sql_queries.cpp b/system-test/sql_queries.cpp similarity index 100% rename from maxscale-system-test/sql_queries.cpp rename to system-test/sql_queries.cpp diff --git a/maxscale-system-test/ssl-cert/ca-key.pem b/system-test/ssl-cert/ca-key.pem similarity index 100% rename from maxscale-system-test/ssl-cert/ca-key.pem rename to system-test/ssl-cert/ca-key.pem diff --git a/maxscale-system-test/ssl-cert/ca.pem b/system-test/ssl-cert/ca.pem similarity index 100% rename from maxscale-system-test/ssl-cert/ca.pem rename to system-test/ssl-cert/ca.pem diff --git a/maxscale-system-test/ssl-cert/client-cert.pem b/system-test/ssl-cert/client-cert.pem similarity index 100% rename from maxscale-system-test/ssl-cert/client-cert.pem rename to system-test/ssl-cert/client-cert.pem diff --git a/maxscale-system-test/ssl-cert/client-key.pem b/system-test/ssl-cert/client-key.pem similarity index 100% rename from maxscale-system-test/ssl-cert/client-key.pem rename to system-test/ssl-cert/client-key.pem diff --git a/maxscale-system-test/ssl-cert/client-req.pem b/system-test/ssl-cert/client-req.pem similarity index 100% rename from maxscale-system-test/ssl-cert/client-req.pem rename to system-test/ssl-cert/client-req.pem diff --git a/maxscale-system-test/ssl-cert/server-cert.pem b/system-test/ssl-cert/server-cert.pem similarity index 100% rename from maxscale-system-test/ssl-cert/server-cert.pem rename to system-test/ssl-cert/server-cert.pem diff --git a/maxscale-system-test/ssl-cert/server-key.pem b/system-test/ssl-cert/server-key.pem similarity index 100% rename from maxscale-system-test/ssl-cert/server-key.pem rename to system-test/ssl-cert/server-key.pem diff --git a/maxscale-system-test/ssl-cert/server-req.pem b/system-test/ssl-cert/server-req.pem similarity index 100% rename from maxscale-system-test/ssl-cert/server-req.pem rename to system-test/ssl-cert/server-req.pem diff --git a/maxscale-system-test/ssl.cnf b/system-test/ssl.cnf similarity index 100% rename from maxscale-system-test/ssl.cnf rename to system-test/ssl.cnf diff --git a/maxscale-system-test/stale_slaves.cpp b/system-test/stale_slaves.cpp similarity index 100% rename from maxscale-system-test/stale_slaves.cpp rename to system-test/stale_slaves.cpp diff --git a/maxscale-system-test/start_without_root.sh b/system-test/start_without_root.sh similarity index 100% rename from maxscale-system-test/start_without_root.sh rename to system-test/start_without_root.sh diff --git a/maxscale-system-test/startup_fail_no_servers.cpp b/system-test/startup_fail_no_servers.cpp similarity index 100% rename from maxscale-system-test/startup_fail_no_servers.cpp rename to system-test/startup_fail_no_servers.cpp diff --git a/maxscale-system-test/sysbench_commands.h b/system-test/sysbench_commands.h similarity index 100% rename from maxscale-system-test/sysbench_commands.h rename to system-test/sysbench_commands.h diff --git a/maxscale-system-test/sysbench_example.cpp b/system-test/sysbench_example.cpp similarity index 100% rename from maxscale-system-test/sysbench_example.cpp rename to system-test/sysbench_example.cpp diff --git a/maxscale-system-test/sysbench_kill_slave.cpp b/system-test/sysbench_kill_slave.cpp similarity index 100% rename from maxscale-system-test/sysbench_kill_slave.cpp rename to system-test/sysbench_kill_slave.cpp diff --git a/maxscale-system-test/t.cpp b/system-test/t.cpp similarity index 100% rename from maxscale-system-test/t.cpp rename to system-test/t.cpp diff --git a/maxscale-system-test/teef_no_master.cpp b/system-test/teef_no_master.cpp similarity index 100% rename from maxscale-system-test/teef_no_master.cpp rename to system-test/teef_no_master.cpp diff --git a/maxscale-system-test/temporal_tables.cpp b/system-test/temporal_tables.cpp similarity index 100% rename from maxscale-system-test/temporal_tables.cpp rename to system-test/temporal_tables.cpp diff --git a/maxscale-system-test/test_ctrl_c/start_killer.sh b/system-test/test_ctrl_c/start_killer.sh similarity index 100% rename from maxscale-system-test/test_ctrl_c/start_killer.sh rename to system-test/test_ctrl_c/start_killer.sh diff --git a/maxscale-system-test/test_ctrl_c/test_ctrl_c.sh b/system-test/test_ctrl_c/test_ctrl_c.sh similarity index 100% rename from maxscale-system-test/test_ctrl_c/test_ctrl_c.sh rename to system-test/test_ctrl_c/test_ctrl_c.sh diff --git a/maxscale-system-test/test_hints.cpp b/system-test/test_hints.cpp similarity index 100% rename from maxscale-system-test/test_hints.cpp rename to system-test/test_hints.cpp diff --git a/maxscale-system-test/test_maxctrl.sh b/system-test/test_maxctrl.sh similarity index 100% rename from maxscale-system-test/test_maxctrl.sh rename to system-test/test_maxctrl.sh diff --git a/maxscale-system-test/utf64.cnf b/system-test/utf64.cnf similarity index 100% rename from maxscale-system-test/utf64.cnf rename to system-test/utf64.cnf diff --git a/maxscale-system-test/utilities.cmake b/system-test/utilities.cmake similarity index 98% rename from maxscale-system-test/utilities.cmake rename to system-test/utilities.cmake index 85548a0f6..8733c68eb 100644 --- a/maxscale-system-test/utilities.cmake +++ b/system-test/utilities.cmake @@ -10,7 +10,7 @@ endfunction() # Helper function to add a configuration template to the global test definitions list. # Parameters are as in add_test_executable(). function(add_template name template labels) - set(config_template_path "${CMAKE_SOURCE_DIR}/maxscale-system-test/cnf/maxscale.cnf.template.${template}") + set(config_template_path "${CMAKE_SOURCE_DIR}/system-test/cnf/maxscale.cnf.template.${template}") set(new_def "{\"${name}\", \"${config_template_path}\", \"${labels}\"}") set(TEST_DEFINITIONS "${TEST_DEFINITIONS}${new_def}," CACHE INTERNAL "") endfunction()