solve ODR issue with dlopened tests

Signed-off-by: Caolán McNamara <[email protected]>
Change-Id: I051c78eafddc41c2c04535a3c03ee095576df57a

Author: caolanm

test/Makefile.am

@@ -137,7 +137,6 @@ AM_CPPFLAGS = -pthread -I$(top_srcdir) -DBUILDING_TESTS -DLOK_ABORT_ON_ASSERTION
 
 wsd_sources = \
 	../kit/Kit.cpp \
-	../kit/KitGlobals.cpp \
 	../kit/KitWebSocket.cpp \
 	../kit/TestStubs.cpp \
 	../wsd/FileServerUtil.cpp \
@@ -157,6 +156,7 @@ test_base_sources = \
 	UtilTests.cpp \
 	WopiProofTests.cpp \
 	UriTests.cpp \
+	TestGlobals.cpp \
 	$(wsd_sources)
 
 common_sources = \
@@ -198,6 +198,7 @@ unittest_CPPFLAGS = -I$(top_srcdir) -DBUILDING_TESTS -DSTANDALONE_CPPUNIT -g
 unittest_SOURCES = \
 	$(test_base_sources) \
 	$(common_sources) \
+	../common/Globals.cpp \
 	../wsd/TestStubs.cpp \
 	test.cpp
 

test/TestGlobals.cpp

@@ -0,0 +1,14 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * Copyright the Collabora Online contributors.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "kit/KitGlobals.hpp"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */