MXS-2900 maxtest includes cleanup

maxscale-system-test/bug448.cpp

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

maxscale-system-test/crash_out_of_files.cpp

@@ -5,11 +5,8 @@
  * - check that no backends are disconnected with error ""refresh rate limit exceeded"
  */
 
-#include "testconnections.h"
-#include "sql_t1.h"
-#include "get_com_select_insert.h"
-
-#include "big_load.h"
+#include <maxtest/big_load.h>
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/different_size_binlog.cpp

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

maxscale-system-test/different_size_rwsplit.cpp

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

maxscale-system-test/load_balancing.cpp

@@ -14,13 +14,8 @@
  * more then 10% of quesries went to Master
  */
 
-
-
-#include "testconnections.h"
-#include "sql_t1.h"
-#include "get_com_select_insert.h"
-
-#include "big_load.h"
+#include <maxtest/big_load.h>
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/longblob.cpp

@@ -3,9 +3,8 @@
  * - try to insert large BLOB, MEDIUMBLOB and LONGBLOB via RWSplit, ReadConn Master and directly to backend
  */
 
-
-#include "testconnections.h"
-#include "blob_test.h"
+#include <maxtest/blob_test.h>
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/maxtest/src/get_my_ip.cc

@@ -3,15 +3,15 @@
  * Use getsockname and a udp connection
  */
 
-#include <stdio.h>      // printf
-#include <string.h>     // memset
-#include <errno.h>      // errno
-#include <sys/socket.h> // socket
-#include <netinet/in.h> // sockaddr_in
-#include <arpa/inet.h>  // getsockname
-#include <unistd.h>     // close
+#include <maxtest/get_my_ip.h>
 
-#include "get_my_ip.h"
+#include <cstdio>      // printf
+#include <cstring>     // memset
+#include <cerrno>      // errno
+#include <unistd.h>     // close
+#include <arpa/inet.h>  // getsockname
+#include <netinet/in.h> // sockaddr_in
+#include <sys/socket.h> // socket
 
 int get_my_ip(char* remote_ip, char* my_ip)
 {

maxscale-system-test/maxtest/src/keepalived_func.cc

@@ -1,5 +1,5 @@
-#include "keepalived_func.h"
-#include "get_my_ip.h"
+#include <maxtest/keepalived_func.h>
+#include <maxtest/get_my_ip.h>
 #include <maxtest/testconnections.h>
 
 char* print_version_string(TestConnections* Test)

maxscale-system-test/mxs1071_maxrows.cpp

@@ -43,10 +43,10 @@
  */
 
 #include <iostream>
-#include "testconnections.h"
-#include "sql_t1.h"
-#include "mariadb_func.h"
-#include "blob_test.h"
+#include <maxtest/blob_test.h>
+#include <maxtest/mariadb_func.h>
+#include <maxtest/sql_t1.h>
+#include <maxtest/testconnections.h>
 
 using namespace std;
 

maxscale-system-test/mxs1110_16mb.cpp

@@ -4,10 +4,9 @@
  * - read data via RWsplit, ReadConn master, ReadConn slave, compare with inserted data
  */
 
-
-#include "testconnections.h"
-#include "blob_test.h"
-#include "fw_copy_rules.h"
+#include <maxtest/blob_test.h>
+#include <maxtest/fw_copy_rules.h>
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/mxs173_throttle_filter.cpp

@@ -2,14 +2,15 @@
  * MXS-173 throttling filter
  */
 
-#include <maxbase/stopwatch.hh>
-#include "testconnections.h"
-#include "appexception.hh"
 #include <iostream>
 #include <memory>
 #include <sstream>
 #include <cmath>
 
+#include <maxbase/stopwatch.hh>
+#include <maxtest/appexception.hh>
+#include <maxtest/testconnections.h>
+
 DEFINE_EXCEPTION(Whoopsy);
 
 constexpr int TIMEOUT = 300;

maxscale-system-test/mxs657_restart.cpp

@@ -4,13 +4,9 @@
  * - playing with 'restart service' and restart Maxscale under load
  */
 
-
-#include "testconnections.h"
-#include "sql_t1.h"
-#include "get_com_select_insert.h"
-
-#include "big_load.h"
-
+#include <maxtest/big_load.h>
+#include <maxtest/sql_t1.h>
+#include <maxtest/testconnections.h>
 
 TestConnections* Test;
 

maxscale-system-test/mxs922_double_listener.cpp

@@ -4,7 +4,7 @@
  * Check that MaxScale doesn't crash when the same listeners are created twice.
  */
 
-#include "config_operations.h"
+#include <maxtest/config_operations.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/mxs922_listener_ssl.cpp

@@ -2,8 +2,8 @@
  * @file mxs922_listener_ssl.cpp MXS-922: Dynamic SSL test
  */
 
-#include "testconnections.h"
-#include "config_operations.h"
+#include <maxtest/config_operations.h>
+#include <maxtest/testconnections.h>
 
 int main(int argc, char* argv[])
 {

maxscale-system-test/mxs922_monitor.cpp

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

maxscale-system-test/mxs922_scaling.cpp

@@ -3,8 +3,8 @@
  *
  */
 
-#include "testconnections.h"
-#include "config_operations.h"
+#include <maxtest/config_operations.h>
+#include <maxtest/testconnections.h>
 
 static bool running = true;
 

maxscale-system-test/mxs922_server.cpp

@@ -3,8 +3,8 @@
  *
  */
 
-#include "testconnections.h"
-#include "config_operations.h"
+#include <maxtest/config_operations.h>
+#include <maxtest/testconnections.h>
 
 int check_server_id(TestConnections* test, int idx)
 {

maxscale-system-test/rw_select_insert.cpp

@@ -11,10 +11,9 @@
  * - execute INSERT 100 times, check COM_SELECT and COM_INSERT after every query (tolerate 2*N+1 queries)
  */
 
-
-#include "testconnections.h"
-#include "get_com_select_insert.h"
-#include "maxadmin_operations.h"
+#include <maxtest/get_com_select_insert.h>
+#include <maxtest/maxadmin_operations.h>
+#include <maxtest/testconnections.h>
 
 /**
  * @brief check_com_select Checks if COM_SELECT increase takes place only on one slave node and there is no