From 2fe58ebe5bf6f9d80dba0e930e7df47c851c8e62 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Thu, 13 Oct 2016 21:43:20 +0300
Subject: [PATCH] Move test_utils.h to server/core/test

---
 {include/maxscale => server/core/test}/test_utils.h | 0
 server/core/test/testpoll.c                         | 2 +-
 server/core/test/testqueuemanager.c                 | 2 +-
 server/core/test/testservice.c                      | 2 +-
 server/modules/filter/dbfwfilter/dbfwfilter.c       | 3 ++-
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename {include/maxscale => server/core/test}/test_utils.h (100%)

diff --git a/include/maxscale/test_utils.h b/server/core/test/test_utils.h
similarity index 100%
rename from include/maxscale/test_utils.h
rename to server/core/test/test_utils.h
diff --git a/server/core/test/testpoll.c b/server/core/test/testpoll.c
index 74c55b4f9..aea0cd1a5 100644
--- a/server/core/test/testpoll.c
+++ b/server/core/test/testpoll.c
@@ -35,8 +35,8 @@
 #include <errno.h>
 #include <maxscale/poll.h>
 #include <maxscale/dcb.h>
-#include <maxscale/test_utils.h>
 #include <maxscale/listener.h>
+#include "test_utils.h"
 
 /**
  * test1    Allocate a service and do lots of other things
diff --git a/server/core/test/testqueuemanager.c b/server/core/test/testqueuemanager.c
index e616d9c99..938010f54 100644
--- a/server/core/test/testqueuemanager.c
+++ b/server/core/test/testqueuemanager.c
@@ -39,9 +39,9 @@ extern int debug_check_fail;
 #include <errno.h>
 #include <maxscale/queuemanager.h>
 #include <maxscale/random_jkiss.h>
-#include <maxscale/test_utils.h>
 #include <maxscale/hk_heartbeat.h>
 #include <maxscale/alloc.h>
+#include "test_utils.h"
 
 /**
  * test1    Allocate a queue and do lots of other things
diff --git a/server/core/test/testservice.c b/server/core/test/testservice.c
index 13ff6e9bc..b3101f1f7 100644
--- a/server/core/test/testservice.c
+++ b/server/core/test/testservice.c
@@ -33,10 +33,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <maxscale/maxscale_test.h>
-#include <maxscale/test_utils.h>
 #include <maxscale/service.h>
 #include <maxscale/gwdirs.h>
 #include <maxscale/alloc.h>
+#include "test_utils.h"
 
 /**
  * test1    Allocate a service and do lots of other things
diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.c b/server/modules/filter/dbfwfilter/dbfwfilter.c
index 01d13dfe1..33e684bd1 100644
--- a/server/modules/filter/dbfwfilter/dbfwfilter.c
+++ b/server/modules/filter/dbfwfilter/dbfwfilter.c
@@ -2330,7 +2330,8 @@ diagnostic(FILTER *instance, void *fsession, DCB *dcb)
 }
 
 #ifdef BUILD_RULE_PARSER
-#include <test_utils.h>
+// TODO: Not ok to include file from other component's test directory.
+#include "../../../core/test/test_utils.h"
 
 int main(int argc, char** argv)
 {