From 6cc8bc36c136280498b14674e4838808df421c48 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Fri, 10 Nov 2017 14:38:10 +0200
Subject: [PATCH] Initialize in test_dcb

Make necessary initializations in test_dcb.
---
 server/core/test/test_dcb.cc | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/server/core/test/test_dcb.cc b/server/core/test/test_dcb.cc
index 7d305f1c2..ac7a79608 100644
--- a/server/core/test/test_dcb.cc
+++ b/server/core/test/test_dcb.cc
@@ -37,6 +37,8 @@
 #include <maxscale/config.h>
 #include <maxscale/listener.h>
 
+#include "../maxscale/messagequeue.hh"
+#include "../maxscale/worker.hh"
 #include "../dcb.cc"
 
 /**
@@ -66,12 +68,20 @@ test1()
 
 int main(int argc, char **argv)
 {
-    int result = 0;
+    int result = 1;
     MXS_CONFIG* glob_conf = config_get_global_options();
     glob_conf->n_threads = 1;
     dcb_global_init();
-
-    result += test1();
+    if (maxscale::MessageQueue::init())
+    {
+        if (maxscale::Worker::init())
+        {
+            result = 0;
+            result += test1();
+            maxscale::Worker::finish();
+        }
+        maxscale::MessageQueue::finish();
+    }
 
     exit(result);
 }