tests: use newly defined test suite

... so that linting information gets propagated properly.

6 files changed, 33 insertions, 25 deletions

diff --git a/test/end-to-end/serve-service/TARGETS b/test/end-to-end/serve-service/TARGETS
index 46e9e0dc..23c0525a 100644
--- a/test/end-to-end/serve-service/TARGETS
+++ b/test/end-to-end/serve-service/TARGETS
@@ -172,9 +172,15 @@
   , "repos": ["serve-many-targets (data)"]
   }
 , "TESTS (unconfigured)":
-  { "type": "install"
-  , "tainted": ["test"]
-  , "arguments_config": ["TEST_COMPATIBLE_REMOTE"]
+  { "type": ["@", "rules", "test", "suite"]
+  , "arguments_config": ["TEST_COMPATIBLE_REMOTE", "TEST_STANDALONE_SERVE"]
+  , "stage":
+    [ { "type": "if"
+      , "cond": {"type": "var", "name": "TEST_STANDALONE_SERVE"}
+      , "then": "standalone-serve"
+      , "else": "separate-remote"
+      }
+    ]
   , "deps":
     { "type": "++"
     , "$1":
@@ -196,15 +202,14 @@
         , "then": []
         , "else": ["serve-tree"]
         }
+      , [ ["./", "serve-archive-root", "TESTS"]
+        , ["./", "serve-git-root", "TESTS"]
+        , ["./", "serve-file-root", "TESTS"]
+        , ["./", "serve-git-tree-root", "TESTS"]
+        , ["./", "serve-distdir-root", "TESTS"]
+        ]
       ]
     }
-  , "dirs":
-    [ [["./", "serve-archive-root", "TESTS"], "serve-archive-root"]
-    , [["./", "serve-git-root", "TESTS"], "serve-git-root"]
-    , [["./", "serve-file-root", "TESTS"], "serve-file-root"]
-    , [["./", "serve-git-tree-root", "TESTS"], "serve-git-tree-root"]
-    , [["./", "serve-distdir-root", "TESTS"], "serve-distdir-root"]
-    ]
   }
 , "TESTS (separate remote)":
   { "type": "configure"
@@ -221,11 +226,8 @@
     {"type": "singleton_map", "key": "TEST_STANDALONE_SERVE", "value": true}
   }
 , "TESTS":
-  { "type": "install"
-  , "tainted": ["test"]
-  , "dirs":
-    [ ["TESTS (separate remote)", "separate-remote"]
-    , ["TESTS (standalone serve)", "standalone-serve"]
-    ]
+  { "type": ["@", "rules", "test", "suite"]
+  , "stage": ["serve-service"]
+  , "deps": ["TESTS (separate remote)", "TESTS (standalone serve)"]
   }
 }
diff --git a/test/end-to-end/serve-service/serve-archive-root/TARGETS b/test/end-to-end/serve-service/serve-archive-root/TARGETS
index a133956b..af54b68b 100644
--- a/test/end-to-end/serve-service/serve-archive-root/TARGETS
+++ b/test/end-to-end/serve-service/serve-archive-root/TARGETS
@@ -99,8 +99,8 @@
     ]
   }
 , "TESTS":
-  { "type": "install"
-  , "tainted": ["test"]
+  { "type": ["@", "rules", "test", "suite"]
+  , "stage": ["serve-archive-root"]
   , "deps":
     [ "unresolved-present"
     , "unresolved-absent"
diff --git a/test/end-to-end/serve-service/serve-distdir-root/TARGETS b/test/end-to-end/serve-service/serve-distdir-root/TARGETS
index 8cff743a..156806d8 100644
--- a/test/end-to-end/serve-service/serve-distdir-root/TARGETS
+++ b/test/end-to-end/serve-service/serve-distdir-root/TARGETS
@@ -55,9 +55,8 @@
   , "repos": [["TREE", null, "foreign-file-data"]]
   }
 , "TESTS":
-  { "type": "install"
-  , "arguments_config": ["TEST_COMPATIBLE_REMOTE"]
-  , "tainted": ["test"]
+  { "type": ["@", "rules", "test", "suite"]
+  , "stage": ["serve-distdir-root"]
   , "deps": ["present", "absent", "upload", "foreign-file"]
   }
 }
diff --git a/test/end-to-end/serve-service/serve-file-root/TARGETS b/test/end-to-end/serve-service/serve-file-root/TARGETS
index 1c51a3e7..60753726 100644
--- a/test/end-to-end/serve-service/serve-file-root/TARGETS
+++ b/test/end-to-end/serve-service/serve-file-root/TARGETS
@@ -8,5 +8,9 @@
     , ["end-to-end/serve-service", "serve-tree (archive)"]
     ]
   }
-, "TESTS": {"type": "install", "tainted": ["test"], "deps": ["upload"]}
+, "TESTS":
+  { "type": ["@", "rules", "test", "suite"]
+  , "stage": ["serve-file-root"]
+  , "deps": ["upload"]
+  }
 }
diff --git a/test/end-to-end/serve-service/serve-git-root/TARGETS b/test/end-to-end/serve-service/serve-git-root/TARGETS
index d8d6b9db..29ccee00 100644
--- a/test/end-to-end/serve-service/serve-git-root/TARGETS
+++ b/test/end-to-end/serve-service/serve-git-root/TARGETS
@@ -23,8 +23,8 @@
     ]
   }
 , "TESTS":
-  { "type": "install"
-  , "tainted": ["test"]
+  { "type": ["@", "rules", "test", "suite"]
+  , "stage": ["serve-git-root"]
   , "deps": ["present", "absent", "absent-upload"]
   }
 }
diff --git a/test/end-to-end/serve-service/serve-git-tree-root/TARGETS b/test/end-to-end/serve-service/serve-git-tree-root/TARGETS
index 143aa7a4..ffcd5bd4 100644
--- a/test/end-to-end/serve-service/serve-git-tree-root/TARGETS
+++ b/test/end-to-end/serve-service/serve-git-tree-root/TARGETS
@@ -13,5 +13,8 @@
   , "repos": [["end-to-end/serve-service", "serve-tree (data)"]]
   }
 , "TESTS":
-  {"type": "install", "tainted": ["test"], "deps": ["present", "absent"]}
+  { "type": ["@", "rules", "test", "suite"]
+  , "stage": ["serve-git-tree-root"]
+  , "deps": ["present", "absent"]
+  }
 }