tests: use newly defined test suite

... so that linting information gets propagated properly.

4 files changed, 12 insertions, 12 deletions

diff --git a/test/buildtool/build_engine/TARGETS b/test/buildtool/build_engine/TARGETS
index bcfcf41d..a3856ffa 100644
--- a/test/buildtool/build_engine/TARGETS
+++ b/test/buildtool/build_engine/TARGETS
@@ -1,10 +1,10 @@
 { "TESTS":
-  { "type": "install"
-  , "tainted": ["test"]
-  , "dirs":
-    [ [["./", "base_maps", "TESTS"], "base_maps"]
-    , [["./", "expression", "TESTS"], "expression"]
-    , [["./", "target_map", "TESTS"], "target_map"]
+  { "type": ["@", "rules", "test", "suite"]
+  , "stage": ["build_engine"]
+  , "deps":
+    [ ["./", "base_maps", "TESTS"]
+    , ["./", "expression", "TESTS"]
+    , ["./", "target_map", "TESTS"]
     ]
   }
 }
diff --git a/test/buildtool/build_engine/base_maps/TARGETS b/test/buildtool/build_engine/base_maps/TARGETS
index c6b683fb..855d6217 100644
--- a/test/buildtool/build_engine/base_maps/TARGETS
+++ b/test/buildtool/build_engine/base_maps/TARGETS
@@ -142,8 +142,8 @@
   , "cmds": ["sh create_maps_test_git_bundle.sh"]
   }
 , "TESTS":
-  { "type": "install"
-  , "tainted": ["test"]
+  { "type": ["@", "rules", "test", "suite"]
+  , "stage": ["base_maps"]
   , "deps":
     [ "directory_map"
     , "entity_name"
diff --git a/test/buildtool/build_engine/expression/TARGETS b/test/buildtool/build_engine/expression/TARGETS
index e7d15616..9284aba3 100644
--- a/test/buildtool/build_engine/expression/TARGETS
+++ b/test/buildtool/build_engine/expression/TARGETS
@@ -36,8 +36,8 @@
   , "stage": ["test", "buildtool", "build_engine", "expression"]
   }
 , "TESTS":
-  { "type": "install"
-  , "tainted": ["test"]
+  { "type": ["@", "rules", "test", "suite"]
+  , "stage": ["expression"]
   , "deps": ["configuration", "expression", "linked_map"]
   }
 }
diff --git a/test/buildtool/build_engine/target_map/TARGETS b/test/buildtool/build_engine/target_map/TARGETS
index f87cc475..6db3919e 100644
--- a/test/buildtool/build_engine/target_map/TARGETS
+++ b/test/buildtool/build_engine/target_map/TARGETS
@@ -106,8 +106,8 @@
   , "stage": ["test", "buildtool", "build_engine", "target_map"]
   }
 , "TESTS":
-  { "type": "install"
-  , "tainted": ["test"]
+  { "type": ["@", "rules", "test", "suite"]
+  , "stage": ["target_map"]
   , "deps": ["result_map", "target_map", "target_map_internals"]
   }
 }