Reorder dependencies and remove duplicates in OSS

6 files changed, 40 insertions, 40 deletions

diff --git a/test/end-to-end/serve-service/TARGETS b/test/end-to-end/serve-service/TARGETS
index 23c0525a..3ab54a14 100644
--- a/test/end-to-end/serve-service/TARGETS
+++ b/test/end-to-end/serve-service/TARGETS
@@ -2,7 +2,7 @@
   { "type": ["end-to-end", "with serve"]
   , "name": ["serve-target-remote-build"]
   , "test": ["serve_target_remote_build.sh"]
-  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   , "repos":
     [ "serve-target-remote-build (repo)"
     , "serve-target-remote-build (rule)"
@@ -14,12 +14,12 @@
   , "name": ["serve-target-failed-build"]
   , "test": ["serve_target_failed_build.sh"]
   , "deps":
-    [ ["", "tool-under-test"]
-    , ["", "mr-tool-under-test"]
-    , "serve-tree (archive)"
-    , "data/targets/TARGETS"
-    , "data/rules/RULES"
+    [ "data/rules/RULES"
     , "data/rules/RULES.dummy"
+    , "data/targets/TARGETS"
+    , "serve-tree (archive)"
+    , ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     ]
   , "repos":
     [ "serve-target-remote-build (repo)"
@@ -88,10 +88,10 @@
   , "name": ["serve-tree"]
   , "test": ["serve-tree.sh"]
   , "deps":
-    [ ["", "mr-tool-under-test"]
-    , ["", "tool-under-test"]
+    [ "data/targets/TARGETS.tree"
     , "serve-tree (archive)"
-    , "data/targets/TARGETS.tree"
+    , ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     ]
   , "repos": ["serve-tree (archive)"]
   }
@@ -104,7 +104,7 @@
   { "type": ["end-to-end", "with serve"]
   , "name": ["serve-target-remote-build-dispatch"]
   , "test": ["serve_target_remote_build_dispatch.sh"]
-  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   , "repos": ["serve-target-remote-build-dispatch (data)"]
   }
 , "serve-query-target-cache-value":
@@ -124,9 +124,9 @@
   , "name": ["describe"]
   , "test": ["describe.sh"]
   , "deps":
-    [ ["", "mr-tool-under-test"]
+    [ "describe (locally installed)"
+    , ["", "mr-tool-under-test"]
     , ["", "tool-under-test"]
-    , "describe (locally installed)"
     ]
   , "repos": ["describe (data)"]
   , "keep": ["out/describe.orig", "out/describe"]
@@ -140,9 +140,9 @@
   , "name": ["failure-report"]
   , "test": ["failure-report.sh"]
   , "deps":
-    [ ["", "mr-tool-under-test"]
+    [ "describe (locally installed)"
+    , ["", "mr-tool-under-test"]
     , ["", "tool-under-test"]
-    , "describe (locally installed)"
     ]
   , "repos": ["failure-report (data)"]
   , "keep": ["out/log", "out/serve.log", "out/failure.log"]
@@ -160,7 +160,7 @@
   { "type": ["end-to-end", "with serve"]
   , "name": ["serve-many-targets"]
   , "test": ["serve_many_targets.sh"]
-  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   , "repos":
     ["serve-many-targets (data)", "serve-many-targets (data in module)"]
   }
@@ -168,7 +168,7 @@
   { "type": ["end-to-end", "with serve"]
   , "name": ["deduplication-of-serve-requests"]
   , "test": ["deduplication_of_serve_requests.sh"]
-  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   , "repos": ["serve-many-targets (data)"]
   }
 , "TESTS (unconfigured)":
diff --git a/test/end-to-end/serve-service/data/targets/TARGETS.dispatch b/test/end-to-end/serve-service/data/targets/TARGETS.dispatch
index 24180bd7..91568434 100644
--- a/test/end-to-end/serve-service/data/targets/TARGETS.dispatch
+++ b/test/end-to-end/serve-service/data/targets/TARGETS.dispatch
@@ -19,12 +19,12 @@
   , "outs": ["out.txt"]
   , "execution properties":
     {"type": "singleton_map", "key": "server", "value": "special"}
-  , "deps": ["payload", "drop"]
+  , "deps": ["drop", "payload"]
   }
 , "internal":
   { "type": "generic"
   , "cmds": ["cat out.txt post.txt > final.txt"]
-  , "deps": ["special-dispatch", "post"]
+  , "deps": ["post", "special-dispatch"]
   , "outs": ["final.txt"]
   }
 , "":
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 af54b68b..2da72a66 100644
--- a/test/end-to-end/serve-service/serve-archive-root/TARGETS
+++ b/test/end-to-end/serve-service/serve-archive-root/TARGETS
@@ -60,9 +60,9 @@
   , "name": ["resolved-present"]
   , "test": ["resolved-present.sh"]
   , "deps":
-    [ ["", "mr-tool-under-test"]
+    [ "serve-tree-syms (archive)"
+    , ["", "mr-tool-under-test"]
     , ["", "tool-under-test"]
-    , "serve-tree-syms (archive)"
     ]
   , "repos": ["serve-tree-syms (archive)"]
   }
@@ -71,9 +71,9 @@
   , "name": ["resolved-absent"]
   , "test": ["resolved-absent.sh"]
   , "deps":
-    [ ["", "mr-tool-under-test"]
+    [ "serve-tree-syms (archive)"
+    , ["", "mr-tool-under-test"]
     , ["", "tool-under-test"]
-    , "serve-tree-syms (archive)"
     ]
   , "repos": ["serve-tree-syms (archive)"]
   }
@@ -82,9 +82,9 @@
   , "name": ["resolved-absent-known"]
   , "test": ["resolved-absent-known.sh"]
   , "deps":
-    [ ["", "mr-tool-under-test"]
+    [ "serve-tree-syms (archive)"
+    , ["", "mr-tool-under-test"]
     , ["", "tool-under-test"]
-    , "serve-tree-syms (archive)"
     ]
   , "repos": ["serve-tree-syms (archive)"]
   }
@@ -93,23 +93,23 @@
   , "name": ["resolved-absent-known-upload"]
   , "test": ["resolved-absent-known-upload.sh"]
   , "deps":
-    [ ["", "mr-tool-under-test"]
+    [ "serve-tree-syms (archive)"
+    , ["", "mr-tool-under-test"]
     , ["", "tool-under-test"]
-    , "serve-tree-syms (archive)"
     ]
   }
 , "TESTS":
   { "type": ["@", "rules", "test", "suite"]
   , "stage": ["serve-archive-root"]
   , "deps":
-    [ "unresolved-present"
+    [ "resolved-absent"
+    , "resolved-absent-known"
+    , "resolved-absent-known-upload"
+    , "resolved-present"
     , "unresolved-absent"
     , "unresolved-absent-known"
     , "unresolved-absent-known-upload"
-    , "resolved-present"
-    , "resolved-absent"
-    , "resolved-absent-known"
-    , "resolved-absent-known-upload"
+    , "unresolved-present"
     ]
   }
 }
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 156806d8..d8b55ee3 100644
--- a/test/end-to-end/serve-service/serve-distdir-root/TARGETS
+++ b/test/end-to-end/serve-service/serve-distdir-root/TARGETS
@@ -16,9 +16,9 @@
   , "name": ["present"]
   , "test": ["present.sh"]
   , "deps":
-    [ ["", "mr-tool-under-test"]
+    [ "serve-distdir (data)"
+    , ["", "mr-tool-under-test"]
     , ["", "tool-under-test"]
-    , "serve-distdir (data)"
     ]
   , "repos": ["serve-distdir (data)"]
   }
@@ -27,9 +27,9 @@
   , "name": ["absent"]
   , "test": ["absent.sh"]
   , "deps":
-    [ ["", "mr-tool-under-test"]
+    [ "serve-distdir (data)"
+    , ["", "mr-tool-under-test"]
     , ["", "tool-under-test"]
-    , "serve-distdir (data)"
     ]
   , "repos": ["serve-distdir (data)"]
   }
@@ -38,9 +38,9 @@
   , "name": ["upload"]
   , "test": ["upload.sh"]
   , "deps":
-    [ ["", "mr-tool-under-test"]
+    [ "serve-distdir (data)"
+    , ["", "mr-tool-under-test"]
     , ["", "tool-under-test"]
-    , "serve-distdir (data)"
     ]
   }
 , "foreign-file":
@@ -57,6 +57,6 @@
 , "TESTS":
   { "type": ["@", "rules", "test", "suite"]
   , "stage": ["serve-distdir-root"]
-  , "deps": ["present", "absent", "upload", "foreign-file"]
+  , "deps": ["absent", "foreign-file", "present", "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 29ccee00..e73b9d0c 100644
--- a/test/end-to-end/serve-service/serve-git-root/TARGETS
+++ b/test/end-to-end/serve-service/serve-git-root/TARGETS
@@ -25,6 +25,6 @@
 , "TESTS":
   { "type": ["@", "rules", "test", "suite"]
   , "stage": ["serve-git-root"]
-  , "deps": ["present", "absent", "absent-upload"]
+  , "deps": ["absent", "absent-upload", "present"]
   }
 }
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 ffcd5bd4..31b2f7ad 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
@@ -15,6 +15,6 @@
 , "TESTS":
   { "type": ["@", "rules", "test", "suite"]
   , "stage": ["serve-git-tree-root"]
-  , "deps": ["present", "absent"]
+  , "deps": ["absent", "present"]
   }
 }