TestSuite: Shift of the globals unit test helper functions into the test suite.

The setting of the SG log levels and developer mode has been removed as this
clashes with the output control set by the test suite main() function.

src/Input/test_hidinput.cxx

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "unitTestHelpers.hxx"
+#include "test_suite/helpers/globals.hxx"
 
 #include <simgear/misc/test_macros.hxx>
 

src/Main/test_autosaveMigration.cxx

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "unitTestHelpers.hxx"
+#include "test_suite/helpers/globals.hxx"
 
 #include <simgear/misc/test_macros.hxx>
 #include <simgear/props/props_io.hxx>

test_suite/CMakeLists.txt

@@ -8,6 +8,9 @@ foreach(test_category
     add_subdirectory(${test_category})
 endforeach(test_category)
 
+# Add the helpers.
+add_subdirectory(helpers)
+
 # Add all test suite sources and headers.
 set(TESTSUITE_SOURCES
     ${TESTSUITE_SOURCES}

test_suite/helpers/CMakeLists.txt

@@ -0,0 +1,12 @@
+set(TESTSUITE_SOURCES
+    ${TESTSUITE_SOURCES}
+    ${CMAKE_CURRENT_SOURCE_DIR}/globals.cxx
+    PARENT_SCOPE
+)
+
+
+set(TESTSUITE_HEADERS
+    ${TESTSUITE_HEADERS}
+    ${CMAKE_CURRENT_SOURCE_DIR}/globals.hxx
+    PARENT_SCOPE
+)

test_suite/helpers/globals.cxx

@@ -1,7 +1,7 @@
 
 #include "config.h"
 
-#include "unitTestHelpers.hxx"
+#include "globals.hxx"
 
 #include <Main/globals.hxx>
 #include <Main/options.hxx>
@@ -33,9 +33,6 @@ namespace fgtest
 
   void initTestGlobals(const std::string& testName)
   {
-    sglog().setLogLevels( SG_ALL, SG_WARN );
-    sglog().setDeveloperMode(true);
-
     globals = new FGGlobals;
 
       bool foundRoot = false;

test_suite/unit_tests/Add-ons/test_AddonManagement.cxx

@@ -21,7 +21,7 @@
 #include "test_AddonManagement.hxx"
 
 #include "config.h"
-#include "tests/unitTestHelpers.hxx"
+#include "test_suite/helpers/globals.hxx"
 
 #include <sstream>
 #include <string>

test_suite/unit_tests/Main/test_posinit.cxx

@@ -18,7 +18,7 @@
 
 #include "test_posinit.hxx"
 
-#include "tests/unitTestHelpers.hxx"
+#include "test_suite/helpers/globals.hxx"
 
 #include <simgear/props/props_io.hxx>
 

test_suite/unit_tests/Navaids/CMakeLists.txt

@@ -2,13 +2,11 @@ set(TESTSUITE_SOURCES
     ${TESTSUITE_SOURCES}
     ${CMAKE_CURRENT_SOURCE_DIR}/TestSuite.cxx
     ${CMAKE_CURRENT_SOURCE_DIR}/test_flightplan.cxx
-    ${PROJECT_SOURCE_DIR}/tests/unitTestHelpers.cxx
     PARENT_SCOPE
 )
 
 set(TESTSUITE_HEADERS
     ${TESTSUITE_HEADERS}
     ${CMAKE_CURRENT_SOURCE_DIR}/test_flightplan.hxx
-    ${PROJECT_SOURCE_DIR}/tests/unitTestHelpers.cxx
     PARENT_SCOPE
 )

test_suite/unit_tests/Navaids/test_flightplan.cxx

@@ -1,6 +1,6 @@
 #include "test_flightplan.hxx"
 
-#include "tests/unitTestHelpers.hxx"
+#include "test_suite/helpers/globals.hxx"
 
 #include <simgear/misc/strutils.hxx>
 

tests/CMakeLists.txt

@@ -88,7 +88,7 @@ set_property(DIRECTORY APPEND PROPERTY fgtestlib_sources "${CMAKE_SOURCE_DIR}/3r
 get_property(fgtestlib_sources DIRECTORY PROPERTY fgtestlib_sources)
 
 add_library(fgtestlib SHARED ${fgtestlib_sources}
-  unitTestHelpers.cxx
+  "${CMAKE_SOURCE_DIR}/test_suite/helpers/globals.cxx"
   testStubs.cxx
   fake_sgSky.cxx
   fake_sgPrecipitation.cxx

tests/test_navaids2.cxx

@@ -1,4 +1,4 @@
-#include "unitTestHelpers.hxx"
+#include "test_suite/helpers/globals.hxx"
 
 #include <simgear/misc/test_macros.hxx>