Tests: reorganise test folders

This resolves a long-standing issue:
we could not use proper include paths for test-helper code that was defined alongside the tests.

Since some test-helper code must now be relocated into the »Vault«-Layer,
I took the opportunity to finally resolve this annoyance. The solution is two-fold
 * introduce a dedicated test-support library
 * remove the quirks that were necessary to support some plain-C tests
Together, this allows to raise the include-directory by one level,
and then to adjust all folder names so that they match the namespace

tests/SConscript

@@ -14,7 +14,7 @@ from Buildhelper import createPlugins
 
 Import('env core_lib vessel_lib vault_lib test_support guimodule tools config')
 env = env.Clone()
-env.Append(CPPPATH='include')  # additional headers for tests
+env.Append(CPPPATH='.')  # tests/ rootdir (relevant for layer specific test support headers)
 
 # test classes of subcomponents linked in shared objects
 sharedTestLibs = {}
@@ -49,7 +49,6 @@ def testCases(env,dir):
         @note: linking scope chosen based on the name-prefix
     """
     env = env.Clone()
-    env.Append(CPPPATH=dir) # add subdir to Includepath
     if dir.startswith('stage'):
         # additional libs used from GUI tests
         env.mergeConf(['sigc++-2.0'])
@@ -77,7 +76,7 @@ envSuite.Append(LINKFLAGS='-Wl,--no-as-needed')
 
 
 # have to treat some subdirs separately.
-specialDirs = ['plugin','tool','include']
+specialDirs = ['plugin','tool']
 testSrcDirs = globRootdirs('*')
 
 

tests/core/DIR_INFO

@@ -1 +0,0 @@
-core components testsuite

tests/core/vault/_WARNING_OBSOLETE_

@@ -1,5 +0,0 @@
-WARNING: This directory is a left-over from the early stages of the Lumiera project.
-It holds a test, which logically belongs into the vault-layer, yet must be linked
-against the steam-layer to use a 'Testclip' from the session.
-
-Once file and output handling is actually designed and settled, this should be sorted out

tests/include/DIR_INFO

@@ -1 +0,0 @@
-test support helpers and interfaces

tests/lib/meta/function-closure-test.cpp

@@ -32,8 +32,8 @@
 #include "lib/meta/typelist-manip.hpp"
 #include "lib/meta/function.hpp"
 #include "lib/meta/function-closure.hpp"
-#include "meta/typelist-diagnostics.hpp"
-#include "meta/tuple-diagnostics.hpp"
+#include "lib/meta/typelist-diagnostics.hpp"
+#include "lib/meta/tuple-diagnostics.hpp"
 
 
 using std::string;

tests/lib/meta/function-composition-test.cpp

@@ -21,7 +21,7 @@
 #include "lib/meta/typelist.hpp"
 #include "lib/meta/function.hpp"
 #include "lib/meta/function-closure.hpp"
-#include "meta/typelist-diagnostics.hpp"
+#include "lib/meta/typelist-diagnostics.hpp"
 
 #include <tuple>
 

tests/lib/meta/function-erasure-test.cpp

@@ -20,7 +20,7 @@
 #include "test/test-helper.hpp"
 #include "lib/meta/function-erasure.hpp"
 #include "lib/error.hpp"
-#include "meta/dummy-functions.hpp"
+#include "lib/meta/dummy-functions.hpp"
 
 #include <functional>
 

tests/lib/meta/generator-combinations-test.cpp

@@ -19,7 +19,7 @@
 #include "test/run.hpp"
 #include "lib/meta/generator.hpp"
 #include "lib/meta/generator-combinations.hpp"
-#include "meta/typelist-diagnostics.hpp"
+#include "lib/meta/typelist-diagnostics.hpp"
 #include "lib/format-string.hpp"
 #include "lib/format-cout.hpp"
 

tests/lib/meta/tuple-diagnostics.hpp

@@ -26,11 +26,11 @@
  */
 
 
-#ifndef META_TUPLE_DIAGNOSTICS_H
-#define META_TUPLE_DIAGNOSTICS_H
+#ifndef LIB_META_TUPLE_DIAGNOSTICS_H
+#define LIB_META_TUPLE_DIAGNOSTICS_H
 
 
-#include "meta/typelist-diagnostics.hpp"
+#include "lib/meta/typelist-diagnostics.hpp"
 #include "lib/meta/tuple-helper.hpp"
 #include "lib/format-string.hpp"
 #include "lib/format-obj.hpp"
@@ -83,4 +83,4 @@ namespace test {
   
   
 }}} // namespace lib::meta::test
-#endif
+#endif /*LIB_META_TUPLE_DIAGNOSTICS_H*/

tests/lib/meta/tuple-helper-test.cpp

@@ -25,8 +25,8 @@
 #include "test/run.hpp"
 #include "test/test-helper.hpp"
 #include "lib/meta/tuple-helper.hpp"
-#include "meta/typelist-diagnostics.hpp"
-#include "meta/tuple-diagnostics.hpp"
+#include "lib/meta/typelist-diagnostics.hpp"
+#include "lib/meta/tuple-diagnostics.hpp"
 #include "lib/format-string.hpp"
 #include "lib/format-cout.hpp"
 #include "lib/hetero-data.hpp"

tests/lib/meta/typelist-diagnostics.hpp

@@ -26,8 +26,8 @@
  **
  */
 
-#ifndef META_TYPELIST_DIAGNOSTICS_H
-#define META_TYPELIST_DIAGNOSTICS_H
+#ifndef LIB_META_TYPELIST_DIAGNOSTICS_H
+#define LIB_META_TYPELIST_DIAGNOSTICS_H
 
 
 #include "test/test-helper.hpp"
@@ -207,4 +207,4 @@ namespace meta {
     
     
 }}} // namespace lib::meta::test
-#endif
+#endif /*LIB_META_TYPELIST_DIAGNOSTICS_H*/

tests/lib/meta/typelist-manip-test.cpp

@@ -32,7 +32,7 @@
 #include "test/run.hpp"
 #include "lib/meta/generator.hpp"
 #include "lib/meta/typelist-manip.hpp"
-#include "meta/typelist-diagnostics.hpp"
+#include "lib/meta/typelist-diagnostics.hpp"
 
 #include <type_traits>
 

tests/lib/meta/typeseq-manip-test.cpp

@@ -31,7 +31,7 @@
 #include "test/run.hpp"
 #include "lib/meta/typeseq-util.hpp"
 #include "lib/meta/typelist-manip.hpp"
-#include "meta/typelist-diagnostics.hpp"
+#include "lib/meta/typelist-diagnostics.hpp"
 
 using std::string;