fixed units and unit collection type, kinda

cmake-build-debug/CMakeFiles/ftests.dir/CXX.includecache

@@ -9,14 +9,8 @@
 /home/phanes/Development/internal/ftests/main.cpp
 iostream
 -
-fstream
--
 src/json/json.h
 /home/phanes/Development/internal/ftests/src/json/json.h
-string
--
-src/json/json-forwards.h
-/home/phanes/Development/internal/ftests/src/json/json-forwards.h
 src/loaders.h
 /home/phanes/Development/internal/ftests/src/loaders.h
 
@@ -187,14 +181,6 @@ float.h
 /home/phanes/Development/internal/ftests/src/loaders.cpp
 loaders.h
 /home/phanes/Development/internal/ftests/src/loaders.h
-json/json.h
-/home/phanes/Development/internal/ftests/src/json/json.h
-json/json-forwards.h
-/home/phanes/Development/internal/ftests/src/json/json-forwards.h
-iostream
--
-fstream
--
 sys/stat.h
 -
 

cmake-build-debug/conf/test.plan

@@ -1,6 +1,6 @@
 {
-  "plan": [
-    { "name": "gcc is present", "depends on":  [ null ] },
-    { "name": "gcYou are not c can compile", "depends on":  [ "gcc is present" ] }
-  ]
-}
+    "plan": [
+        { "name": "gcc is present", "depends on":  [ null ] },
+        { "name": "gcYou are not c can compile", "depends on":  [ "gcc is present" ] }
+    ]
+}

cmake-build-debug/conf/units/all_test.units

@@ -1,19 +1,22 @@
 {
-      "name":             "gcc is present",
-      "target":           "./ubuntu/xenial/check_gcc_present.run",
-      "output":           "present",
-      "rectifier":	      "./ubuntu/xenial/install_gcc",
-      "active":	          true,
-      "required":         true,
-      "rectify":          true
-},
-{
-      "name":             "gcc can compile",
-      "target":           "./ubuntu/xenial/check_gcc_compiles.run",
-      "output":           "can compile",
-      "rectifier":	      "",
-      "active":	          true,
-      "required":         true,
-      "rectify":          false
-}
-
+    "units": [
+        {
+            "name":             "gcc is present",
+            "target":           "./ubuntu/xenial/check_gcc_present.run",
+            "output":           "present",
+            "rectifier":	      "./ubuntu/xenial/install_gcc",
+            "active":	          true,
+            "required":         true,
+            "rectify":          true
+        },
+        {
+            "name":             "gcc can compile",
+            "target":           "./ubuntu/xenial/check_gcc_compiles.run",
+            "output":           "can compile",
+            "rectifier":	      "",
+            "active":	          true,
+            "required":         true,
+            "rectify":          false
+        }
+    ]
+}

cmake-build-debug/config.json

@@ -1,7 +1,4 @@
 {
-  "units_path":	"./conf/units",
-  "plan_path":  "./conf/test.plan",
-  "arr_test": [
-    "rt", "te", "ter", "ter"
-  ]
+  "units_path":	"./conf/units/all_test.units",
+  "plan_path":  "./conf/test.plan"
 }

cmake-build-debug/ftests.cbp

@@ -84,20 +84,20 @@
          </MakeCommands>
       </Target>
       </Build>
-      <Unit filename="/home/phanes/Development/internal/ftests/main.cpp">
+      <UnitHolder filename="/home/phanes/Development/internal/ftests/main.cpp">
          <Option target="ftests"/>
-      </Unit>
-      <Unit filename="/home/phanes/Development/internal/ftests/src/jsoncpp.cpp">
+      </UnitHolder>
+      <UnitHolder filename="/home/phanes/Development/internal/ftests/src/jsoncpp.cpp">
          <Option target="ftests"/>
-      </Unit>
-      <Unit filename="/home/phanes/Development/internal/ftests/src/loaders.cpp">
+      </UnitHolder>
+      <UnitHolder filename="/home/phanes/Development/internal/ftests/src/loaders.cpp">
          <Option target="ftests"/>
-      </Unit>
-      <Unit filename="/home/phanes/Development/internal/ftests/src/loaders.h">
+      </UnitHolder>
+      <UnitHolder filename="/home/phanes/Development/internal/ftests/src/loaders.h">
          <Option target="ftests"/>
-      </Unit>
-      <Unit filename="/home/phanes/Development/internal/ftests/CMakeLists.txt">
+      </UnitHolder>
+      <UnitHolder filename="/home/phanes/Development/internal/ftests/CMakeLists.txt">
           <Option virtualFolder="CMake Files\" />
-      </Unit>
+      </UnitHolder>
    </Project>
 </CodeBlocks_project_file>