From ee005393661592b3575683bd6b947394083b0b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Thu, 21 Dec 2017 08:42:37 +0200 Subject: [PATCH] Fix mxs1509 output The status dumping function now returns a string instead of a pointer to a static buffer. --- maxscale-system-test/mxs1509.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/maxscale-system-test/mxs1509.cpp b/maxscale-system-test/mxs1509.cpp index 4ae7f61bb..e9c5f8391 100644 --- a/maxscale-system-test/mxs1509.cpp +++ b/maxscale-system-test/mxs1509.cpp @@ -23,7 +23,7 @@ void change_master(TestConnections& test, int slave, int master, const char* nam source.c_str(), test.repl->IP[master], test.repl->user_name, test.repl->password, source.c_str()); } -const char* dump_status(const StringSet& current, const StringSet& expected) +std::string dump_status(const StringSet& current, const StringSet& expected) { std::stringstream ss; ss << "Current status: ("; @@ -42,8 +42,7 @@ const char* dump_status(const StringSet& current, const StringSet& expected) ss << ")"; - static std::string res = ss.str(); - return res.c_str(); + return ss.str(); } void check_status(TestConnections& test, const StringSet& expected_master, const StringSet& expected_slave) @@ -52,9 +51,9 @@ void check_status(TestConnections& test, const StringSet& expected_master, const StringSet master = test.get_server_status("server1"); StringSet slave = test.get_server_status("server2"); test.add_result(master != expected_master, "Master status is not what was expected: %s", - dump_status(master, expected_master)); + dump_status(master, expected_master).c_str()); test.add_result(slave != expected_slave, "Slave status is not what was expected: %s", - dump_status(slave, expected_slave)); + dump_status(slave, expected_slave).c_str()); } int main(int argc, char** argv)