MXS-2900 maxtest includes cleanup, part 3

maxscale-system-test/CMakeLists.txt

@@ -19,13 +19,8 @@ set(TEST_DEFINITIONS "" CACHE INTERNAL "")
 include(utilities.cmake)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/connectors/cdc-connector)
-
-include_directories(${CMAKE_BINARY_DIR})
 # Include the CDC connector headers
-include_directories(${CMAKE_SOURCE_DIR}/../connectors/cdc-connector/)
-include_directories(maxtest/include/maxtest)
+include_directories(${CMAKE_SOURCE_DIR}/connectors/cdc-connector)
 include_directories(maxtest/include)
 
 # Tool used to check backend state

maxscale-system-test/alter_router.cpp

@@ -2,7 +2,7 @@
  * Test runtime modification of router options
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <vector>
 #include <iostream>
 #include <functional>

maxscale-system-test/avro_alter.cpp

@@ -2,7 +2,7 @@
  * @file avro_alter.cpp Test ALTER TABLE handling of avrorouter
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <jansson.h>
 #include <sstream>
 #include <iostream>

maxscale-system-test/backend_auth_fail.cpp

@@ -4,7 +4,7 @@
  * MaxScale should not crash
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {

maxscale-system-test/binary_ps.cpp

@@ -1,7 +1,7 @@
 /**
  * Test binary protocol prepared statement routing
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {

maxscale-system-test/binary_ps_cursor.cpp

@@ -1,7 +1,7 @@
 /**
  * Test that binary protocol cursors work as expected
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <iostream>
 
 using std::cout;

maxscale-system-test/binlog_change_master.cpp

@@ -11,7 +11,7 @@
  * - check data on all nodes
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "binlog_change_master_common.cpp"
 
 int main(int argc, char* argv[])

maxscale-system-test/binlog_change_master_common.cpp

@@ -1,4 +1,4 @@
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <functional>
 
 void run_test(TestConnections& test, std::function<void(MYSQL*)> cb)

maxscale-system-test/binlog_change_master_gtid.cpp

@@ -2,7 +2,7 @@
  * The GTID version of binlog_change_master
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "binlog_change_master_common.cpp"
 
 int main(int argc, char* argv[])

maxscale-system-test/binlog_incompl.cpp

@@ -5,9 +5,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
-#include "maxadmin_operations.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/bug143.cpp

@@ -5,7 +5,7 @@
  * - try to connect using RWSplit. First and third are expected to fail, second should succeed.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/bug471.cpp

@@ -145,7 +145,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 

maxscale-system-test/bug473.cpp

@@ -50,7 +50,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 

maxscale-system-test/bug475.cpp

@@ -30,7 +30,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 

maxscale-system-test/bug519.cpp

@@ -67,8 +67,8 @@
 
 
 #include <iostream>
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 
 using namespace std;
 

maxscale-system-test/bug529.cpp

@@ -126,8 +126,8 @@
 
 
 #include <iostream>
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 
 using namespace std;
 

maxscale-system-test/bug547.cpp

@@ -18,7 +18,7 @@
 // also relates to bug594
 // all slaves in MaxScale config have wrong IP
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/bug565.cpp

@@ -53,7 +53,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/bug571.cpp

@@ -115,7 +115,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 

maxscale-system-test/bug572.cpp

@@ -13,7 +13,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 

maxscale-system-test/bug587.cpp

@@ -65,7 +65,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 

maxscale-system-test/bug592.cpp

@@ -87,7 +87,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/bug601.cpp

@@ -46,7 +46,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 

maxscale-system-test/bug620.cpp

@@ -235,7 +235,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 

maxscale-system-test/bug626.cpp

@@ -2,7 +2,7 @@
  * Check that old-style passwords are detected
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/bug653.cpp

@@ -46,7 +46,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/bug654.cpp

@@ -57,8 +57,8 @@
  */
 
 
-#include "testconnections.h"
-#include "maxadmin_operations.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/bug658.cpp

@@ -23,7 +23,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/bug662.cpp

@@ -9,8 +9,8 @@
  * - Sleep and check if Maxscale is alive
  */
 
-#include "testconnections.h"
-#include "maxadmin_operations.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/bug664.cpp

@@ -6,7 +6,7 @@
  * - An error should be logged about the failed branch session
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/bug673.cpp

@@ -8,8 +8,8 @@
  * - Check that only new style object names in maxadmin commands are accepted
  */
 
-#include "testconnections.h"
-#include "maxadmin_operations.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/bug705.cpp

@@ -273,8 +273,8 @@
 
 
 #include <iostream>
-#include "testconnections.h"
-#include "maxadmin_operations.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/bug729.cpp

@@ -60,7 +60,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/bug730.cpp

@@ -41,7 +41,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/bulk_insert.cpp

@@ -5,7 +5,7 @@
  * https://mariadb.com/kb/en/mariadb/bulk-insert-column-wise-binding/
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 static int show_mysql_error(MYSQL* mysql)
 {

maxscale-system-test/cache_runtime.cpp

@@ -14,7 +14,7 @@
 #include <iostream>
 #include <string>
 #include <vector>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 

maxscale-system-test/cache_runtime_ttl.cpp

@@ -14,7 +14,7 @@
 #include <iostream>
 #include <string>
 #include <vector>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 

maxscale-system-test/ccrfilter.cpp

@@ -23,7 +23,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 static int master_id;
 

maxscale-system-test/ccrfilter_global.cpp

@@ -2,7 +2,7 @@
  * Test global mode for the CCRFilter
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/cdc_datatypes/cdc_datatypes.cpp

@@ -2,7 +2,7 @@
  * @file cdc_connect.cpp Test the CDC protocol
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <cdc_connector.h>
 #include "cdc_result.h"
 #include <iostream>

maxscale-system-test/change_master.cpp

@@ -1,5 +1,5 @@
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 

maxscale-system-test/change_master_during_session.cpp

@@ -7,8 +7,8 @@
  */
 
 #include <iostream>
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 
 using namespace std;
 

maxscale-system-test/change_user.cpp

@@ -12,7 +12,7 @@
  * - try INSERT again expecting success (user should not be changed)
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 void run_test(TestConnections& test, MYSQL* conn)
 {

maxscale-system-test/check_backend.cpp

@@ -4,7 +4,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char *argv[])
 {

maxscale-system-test/clustrix_mon.cpp

@@ -19,7 +19,7 @@
  * See Clustrix_nodes.h for details about configiration
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/compound_statement.cpp

@@ -2,7 +2,7 @@
  * Test 10.1 compound statements
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {

maxscale-system-test/config_test.cpp

@@ -5,7 +5,7 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using std::string;
 

maxscale-system-test/connect_to_nonexisting_db.cpp

@@ -2,8 +2,8 @@
  * @file connect_to_nonexisting_db.cpp Tries to connect to non existing DB, expects no crash
  */
 
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 
 bool try_connect(TestConnections& test)
 {

maxscale-system-test/connection_limit.cpp

@@ -6,7 +6,7 @@
  * - create max num of connections and check tha N+1 connection fails
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 void check_with_wrong_pw(int router, int max_conn, TestConnections& test);
 void check_max_conn(int router, int max_conn, TestConnections& test);

maxscale-system-test/crash_on_bad_sescmd.cpp

@@ -2,7 +2,7 @@
  * Double-close on bad session command result
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 void run_test(TestConnections& test)
 {

maxscale-system-test/csmon_test.cpp

@@ -2,7 +2,7 @@
  * MXS-2146: Test case for csmon
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/encrypted_passwords.cpp

@@ -4,7 +4,7 @@
  */
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 /** Remove old keys and create a new one */
 int create_key(TestConnections* test)

maxscale-system-test/error_messages.cpp

@@ -6,7 +6,7 @@
  * - repeat for RWSplit, ReadConn
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <iostream>
 #include <algorithm>
 

maxscale-system-test/fail_switch_rejoin_common.cpp

@@ -1,4 +1,4 @@
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int inserts = 0;
 bool interactive = false;

maxscale-system-test/false_monitor_state_change.cpp

@@ -2,7 +2,7 @@
  * Test false server state changes when manually clearing master bit
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/fwf.cpp

@@ -18,10 +18,10 @@
 
 #include <iostream>
 #include <ctime>
-#include "testconnections.h"
-#include "maxadmin_operations.h"
-#include "sql_t1.h"
-#include "fw_copy_rules.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
+#include <maxtest/sql_t1.h>
+#include <maxtest/fw_copy_rules.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/fwf2.cpp

@@ -17,10 +17,10 @@
 
 #include <iostream>
 #include <ctime>
-#include "testconnections.h"
-#include "maxadmin_operations.h"
-#include "sql_t1.h"
-#include "fw_copy_rules.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
+#include <maxtest/sql_t1.h>
+#include <maxtest/fw_copy_rules.h>
 
 int read_and_execute_queries(TestConnections* Test, const char* filename, int expected)
 {

maxscale-system-test/fwf_actions.cpp

@@ -9,8 +9,8 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
-#include "fw_copy_rules.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/fw_copy_rules.h>
 
 int main(int argc, char** argv)
 {

maxscale-system-test/fwf_com_ping.cpp

@@ -4,8 +4,8 @@
  * Check that COM_PING is allowed with `action=allow`
  */
 
-#include "testconnections.h"
-#include "fw_copy_rules.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/fw_copy_rules.h>
 
 const char* rules = "rule test1 deny regex '.*'\n"
                     "users %@% match any rules test1\n";

maxscale-system-test/fwf_duplicate_rules.cpp

@@ -4,8 +4,8 @@
  * Check if duplicate rules are detected.
  */
 
-#include "testconnections.h"
-#include "fw_copy_rules.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/fw_copy_rules.h>
 
 const char* rules = "rule test1 deny no_where_clause\n"
                     "rule test1 deny columns a b c\n"

maxscale-system-test/fwf_logging.cpp

@@ -7,8 +7,8 @@
 
 #include <iostream>
 #include <unistd.h>
-#include "testconnections.h"
-#include "fw_copy_rules.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/fw_copy_rules.h>
 
 int main(int argc, char** argv)
 {

maxscale-system-test/fwf_prepared_stmt.cpp

@@ -5,8 +5,8 @@
  * properly handled.
  */
 
-#include "testconnections.h"
-#include "fw_copy_rules.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/fw_copy_rules.h>
 
 const char* rules = "rule test1 deny columns c on_queries select\n"
                     "users %@% match any rules test1\n";

maxscale-system-test/fwf_reload.cpp

@@ -5,10 +5,10 @@
 
 #include <iostream>
 #include <ctime>
-#include "testconnections.h"
-#include "maxadmin_operations.h"
-#include "sql_t1.h"
-#include "fw_copy_rules.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
+#include <maxtest/sql_t1.h>
+#include <maxtest/fw_copy_rules.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/fwf_strict.cpp

@@ -4,8 +4,8 @@
  * Check that COM_PING is allowed with `action=allow`
  */
 
-#include "testconnections.h"
-#include "fw_copy_rules.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/fw_copy_rules.h>
 
 #include <fstream>
 

maxscale-system-test/fwf_syntax.cpp

@@ -10,8 +10,8 @@
 #include <iostream>
 #include <unistd.h>
 #include <linux/limits.h>
-#include "testconnections.h"
-#include "fw_copy_rules.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/fw_copy_rules.h>
 
 const char* temp_rules = "rules_tmp.txt";
 

maxscale-system-test/galera_priority.cpp

@@ -13,7 +13,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 

maxscale-system-test/kerberos_setup.cpp

@@ -7,7 +7,7 @@
 
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/kill_master.cpp

@@ -9,7 +9,7 @@
  */
 
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/kill_query.cpp

@@ -2,7 +2,7 @@
  * Test KILL QUERY functionality
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/local_address.cpp

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <algorithm>
 #include <iostream>
 #include <iterator>

maxscale-system-test/long_sysbench.cpp

@@ -8,7 +8,7 @@
  */
 
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "sysbench_commands.h"
 
 int main(int argc, char* argv[])

maxscale-system-test/long_test.cpp

@@ -6,8 +6,8 @@
  */
 
 
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 
 typedef void * FUNC(void * ptr);
 

maxscale-system-test/lots_of_rows.cpp

@@ -6,8 +6,8 @@
 
 
 #include <iostream>
-#include "testconnections.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/sql_t1.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/mariadbmonitor/mysqlmon_detect_standalone_master.cpp

@@ -11,7 +11,7 @@
 
 #include <iostream>
 #include <sstream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 
 using std::stringstream;

maxscale-system-test/mariadbmonitor/mysqlmon_enforce_simple.cpp

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <iostream>
 #include <maxbase/format.hh>
 

maxscale-system-test/mariadbmonitor/mysqlmon_external_master.cpp

@@ -1,7 +1,7 @@
 /**
  * Test monitoring and failover with ignore_external_masters=true
  */
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 #include <atomic>
 #include <thread>

maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_events.cpp

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "failover_common.cpp"
 #include <string>
 

maxscale-system-test/mariadbmonitor/mysqlmon_fail_switch_multi.cpp

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 #include <iostream>
 #include <string>

maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual.cpp

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "failover_common.cpp"
 
 int main(int argc, char** argv)

maxscale-system-test/mariadbmonitor/mysqlmon_failover_manual2.cpp

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <exception>
 #include <iostream>
 #include <sstream>

maxscale-system-test/mariadbmonitor/mysqlmon_failover_no_slaves.cpp

@@ -13,7 +13,7 @@
 
 // MXS-2652: https://jira.mariadb.org/browse/MXS-2652
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 using std::string;
 

maxscale-system-test/mariadbmonitor/mysqlmon_failover_readonly.cpp

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 #include <iostream>
 #include <string>

maxscale-system-test/mariadbmonitor/mysqlmon_failover_rejoin_old_slave.cpp

@@ -15,7 +15,7 @@
 #include <iterator>
 #include <string>
 #include <sstream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using std::cerr;
 using std::cout;

maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_master.cpp

@@ -14,7 +14,7 @@
 #include <iostream>
 #include <string>
 #include <sstream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using std::cerr;
 using std::cout;

maxscale-system-test/mariadbmonitor/mysqlmon_failover_rolling_restart_slaves.cpp

@@ -15,7 +15,7 @@
 #include <iterator>
 #include <string>
 #include <sstream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using std::cerr;
 using std::cout;

maxscale-system-test/mariadbmonitor/mysqlmon_failover_stress.cpp

@@ -18,7 +18,7 @@
 #include <thread>
 #include <vector>
 #include <random>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 
 using namespace std;

maxscale-system-test/mariadbmonitor/mysqlmon_multimaster.cpp

@@ -21,9 +21,9 @@
 #include <iostream>
 #include <string>
 #include <set>
-#include "testconnections.h"
-#include "maxadmin_operations.h"
-#include "sql_t1.h"
+#include <maxtest/testconnections.h>
+#include <maxtest/maxadmin_operations.h>
+#include <maxtest/sql_t1.h>
 #include <jansson.h>
 #include <maxbase/string.hh>
 

maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad.cpp

@@ -14,7 +14,7 @@
 #include <iostream>
 #include <vector>
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 
 using std::string;

maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_bad2.cpp

@@ -15,7 +15,7 @@
 #include <iostream>
 #include <iterator>
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 
 using std::string;

maxscale-system-test/mariadbmonitor/mysqlmon_rejoin_manual2.cpp

@@ -13,7 +13,7 @@
 
 #include <vector>
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 #include <iostream>
 

maxscale-system-test/mariadbmonitor/mysqlmon_reset_replication.cpp

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 #include <iostream>
 #include <string>

maxscale-system-test/mariadbmonitor/mysqlmon_switchover.cpp

@@ -15,7 +15,7 @@
 #include <iterator>
 #include <string>
 #include <sstream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using std::cerr;
 using std::cout;

maxscale-system-test/mariadbmonitor/mysqlmon_switchover_auto.cpp

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 #include <iostream>
 #include <string>

maxscale-system-test/mariadbmonitor/mysqlmon_switchover_bad_master.cpp

@@ -15,7 +15,7 @@
 #include <iterator>
 #include <string>
 #include <sstream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using std::cerr;
 using std::cout;

maxscale-system-test/mariadbmonitor/mysqlmon_switchover_stress.cpp

@@ -18,7 +18,7 @@
 #include <thread>
 #include <vector>
 #include <random>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include "fail_switch_rejoin_common.cpp"
 
 using namespace std;

maxscale-system-test/mariadbmonitor/verify_master_failure.cpp

@@ -4,7 +4,7 @@
  * Testing of master failure verification
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/masking_auto_firewall.cpp

@@ -12,7 +12,7 @@
  */
 
 #include <iostream>
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 using namespace std;
 

maxscale-system-test/max_connections.cpp

@@ -7,7 +7,7 @@
  * - close all connections
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 #define CONNECTIONS 21
 #define ITER        25

maxscale-system-test/maxctrl_basic.cpp

@@ -2,7 +2,7 @@
  * Minimal MaxCtrl sanity check
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 
 int main(int argc, char** argv)
 {

maxscale-system-test/maxinfo_sql.cpp

@@ -2,7 +2,7 @@
  * Test MaxInfo with the SQL interface
  */
 
-#include "testconnections.h"
+#include <maxtest/testconnections.h>
 #include <string>
 #include <thread>
 #include <vector>