summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac1
-rw-r--r--src/lib/config/tests/cmd_http_listener_unittests.cc2
-rw-r--r--src/lib/http/tests/Makefile.am1
-rw-r--r--src/lib/http/tests/server_client_unittests.cc2
-rw-r--r--src/lib/http/testutils/test_http_client.h (renamed from src/lib/http/tests/test_http_client.h)0
5 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 927dc33e9b..488717b14c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1645,6 +1645,7 @@ AC_CONFIG_FILES([src/lib/hooks/tests/marker_file.h])
AC_CONFIG_FILES([src/lib/hooks/tests/test_libraries.h])
AC_CONFIG_FILES([src/lib/http/Makefile])
AC_CONFIG_FILES([src/lib/http/tests/Makefile])
+AC_CONFIG_FILES([src/lib/http/testutils/Makefile])
AC_CONFIG_FILES([src/lib/log/Makefile])
AC_CONFIG_FILES([src/lib/log/compiler/Makefile])
AC_CONFIG_FILES([src/lib/log/interprocess/Makefile])
diff --git a/src/lib/config/tests/cmd_http_listener_unittests.cc b/src/lib/config/tests/cmd_http_listener_unittests.cc
index 300d28617f..ee7c7499fa 100644
--- a/src/lib/config/tests/cmd_http_listener_unittests.cc
+++ b/src/lib/config/tests/cmd_http_listener_unittests.cc
@@ -14,7 +14,7 @@
#include <config/command_mgr.h>
#include <http/response.h>
#include <http/response_parser.h>
-#include <http/tests/test_http_client.h>
+#include <http/testutils/test_http_client.h>
#include <util/multi_threading_mgr.h>
#include <testutils/gtest_utils.h>
diff --git a/src/lib/http/tests/Makefile.am b/src/lib/http/tests/Makefile.am
index c8005e25a9..fcd3398739 100644
--- a/src/lib/http/tests/Makefile.am
+++ b/src/lib/http/tests/Makefile.am
@@ -53,7 +53,6 @@ libhttp_unittests_SOURCES += tls_server_unittests.cc
libhttp_unittests_SOURCES += tls_client_unittests.cc
endif
libhttp_unittests_SOURCES += url_unittests.cc
-libhttp_unittests_SOURCES += test_http_client.h
libhttp_unittests_SOURCES += client_mt_unittests.cc
libhttp_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
diff --git a/src/lib/http/tests/server_client_unittests.cc b/src/lib/http/tests/server_client_unittests.cc
index 4b71b259fb..b34e440477 100644
--- a/src/lib/http/tests/server_client_unittests.cc
+++ b/src/lib/http/tests/server_client_unittests.cc
@@ -9,7 +9,7 @@
#include <asiolink/interval_timer.h>
#include <asiolink/tls_acceptor.h>
#include <cc/data.h>
-#include <test_http_client.h>
+#include <http/testutils/test_http_client.h>
#include <http/client.h>
#include <http/http_types.h>
#include <http/listener.h>
diff --git a/src/lib/http/tests/test_http_client.h b/src/lib/http/testutils/test_http_client.h
index 64db858db3..64db858db3 100644
--- a/src/lib/http/tests/test_http_client.h
+++ b/src/lib/http/testutils/test_http_client.h