hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix test-program failures

Browse Source 
Due to recent changes, mxs::MessageQueue::init() must be called
explicitly, if a monitor is created.
This commit is contained in:
Johan Wikman
2018-06-29 10:42:28 +03:00
parent 9525d3507b
commit 0afcd4b468
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/core/test/test_modulecmd.cc
View File

@ -17,6 +17,7 @@
#include <maxscale/alloc.h> #include <maxscale/alloc.h>
#include <maxscale/dcb.h> #include <maxscale/dcb.h>
#include <maxscale/messagequeue.hh>
#include <maxscale/paths.h> #include <maxscale/paths.h>
#include <maxscale/modulecmd.h> #include <maxscale/modulecmd.h>
#include <maxscale/session.h> #include <maxscale/session.h>
@ -464,6 +465,8 @@ int main(int argc, char **argv)
{ {
int rc = 0; int rc = 0;
mxs::MessageQueue::init();
rc += test_arguments(); rc += test_arguments();
rc += test_optional_arguments(); rc += test_optional_arguments();
rc += test_module_errors(); rc += test_module_errors();

3
server/modules/monitor/mariadbmon/test/test_cycle_find.cc
View File

@ -19,6 +19,7 @@
#include <sstream> #include <sstream>
#include <vector> #include <vector>
#include <maxscale/alloc.h> #include <maxscale/alloc.h>
#include <maxscale/messagequeue.hh>
#include <set> #include <set>
using std::string; using std::string;
@ -69,6 +70,8 @@ private:
int main() int main()
{ {
mxs::MessageQueue::init();
MariaDBMonitor::Test tester; MariaDBMonitor::Test tester;
return tester.run_tests(); return tester.run_tests();
} }