From 396da06eb879e7c5c8d1ee55f3b61e731dc47654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Thu, 15 Nov 2018 10:57:52 +0200 Subject: [PATCH] Move sync_with_stdio into TestConnections constructor This way all tests run with the same configuration. --- maxscale-system-test/cache_runtime.cpp | 2 -- maxscale-system-test/cache_runtime_ttl.cpp | 2 -- maxscale-system-test/mysqlmon_failover_stress.cpp | 2 -- maxscale-system-test/mysqlmon_switchover.cpp | 2 -- maxscale-system-test/mysqlmon_switchover_stress.cpp | 2 -- maxscale-system-test/testconnections.cpp | 1 + 6 files changed, 1 insertion(+), 10 deletions(-) diff --git a/maxscale-system-test/cache_runtime.cpp b/maxscale-system-test/cache_runtime.cpp index c5d3f032d..97f755377 100644 --- a/maxscale-system-test/cache_runtime.cpp +++ b/maxscale-system-test/cache_runtime.cpp @@ -197,8 +197,6 @@ void run(TestConnections& test) int main(int argc, char* argv[]) { - std::ios::sync_with_stdio(true); - TestConnections test(argc, argv); if (test.maxscales->connect_rwsplit() == 0) diff --git a/maxscale-system-test/cache_runtime_ttl.cpp b/maxscale-system-test/cache_runtime_ttl.cpp index b1ba7869e..c3a58ded6 100644 --- a/maxscale-system-test/cache_runtime_ttl.cpp +++ b/maxscale-system-test/cache_runtime_ttl.cpp @@ -178,8 +178,6 @@ void run(TestConnections& test) int main(int argc, char* argv[]) { - std::ios::sync_with_stdio(true); - TestConnections test(argc, argv); if (test.maxscales->connect_rwsplit() == 0) diff --git a/maxscale-system-test/mysqlmon_failover_stress.cpp b/maxscale-system-test/mysqlmon_failover_stress.cpp index 27369927e..017110451 100644 --- a/maxscale-system-test/mysqlmon_failover_stress.cpp +++ b/maxscale-system-test/mysqlmon_failover_stress.cpp @@ -572,8 +572,6 @@ void run(TestConnections& test) int main(int argc, char* argv[]) { - std::ios::sync_with_stdio(true); - Mariadb_nodes::require_gtid(true); TestConnections test(argc, argv); diff --git a/maxscale-system-test/mysqlmon_switchover.cpp b/maxscale-system-test/mysqlmon_switchover.cpp index fd295f860..9439d68a9 100644 --- a/maxscale-system-test/mysqlmon_switchover.cpp +++ b/maxscale-system-test/mysqlmon_switchover.cpp @@ -172,8 +172,6 @@ void run(TestConnections& test) int main(int argc, char* argv[]) { - std::ios::sync_with_stdio(true); - Mariadb_nodes::require_gtid(true); TestConnections test(argc, argv); diff --git a/maxscale-system-test/mysqlmon_switchover_stress.cpp b/maxscale-system-test/mysqlmon_switchover_stress.cpp index 788418b9d..a48bc4573 100644 --- a/maxscale-system-test/mysqlmon_switchover_stress.cpp +++ b/maxscale-system-test/mysqlmon_switchover_stress.cpp @@ -636,8 +636,6 @@ void run(TestConnections& test) int main(int argc, char* argv[]) { - std::ios::sync_with_stdio(true); - Mariadb_nodes::require_gtid(true); TestConnections test(argc, argv); diff --git a/maxscale-system-test/testconnections.cpp b/maxscale-system-test/testconnections.cpp index 4f093e46b..30687a60e 100644 --- a/maxscale-system-test/testconnections.cpp +++ b/maxscale-system-test/testconnections.cpp @@ -107,6 +107,7 @@ TestConnections::TestConnections(int argc, char* argv[]) , threads(4) , use_ipv6(false) { + std::ios::sync_with_stdio(true); signal_set(SIGSEGV, sigfatal_handler); signal_set(SIGABRT, sigfatal_handler); signal_set(SIGFPE, sigfatal_handler);