test: Use own installed just and just-mr targets...

...which do not stage also the debug source and header files (while
in debug mode), as this is unnecessary bloat in the tests.

As the tool-under-test and mr-tool-under-test targets should be
used instead of the regular install targets also in the various
extra rules in end-to-end and utils, move their definition in the
outmost test TARGETS file.

6 files changed, 49 insertions, 61 deletions

diff --git a/test/end-to-end/serve-service/TARGETS b/test/end-to-end/serve-service/TARGETS
index 18941f83..46e9e0dc 100644
--- a/test/end-to-end/serve-service/TARGETS
+++ b/test/end-to-end/serve-service/TARGETS
@@ -2,8 +2,7 @@
   { "type": ["end-to-end", "with serve"]
   , "name": ["serve-target-remote-build"]
   , "test": ["serve_target_remote_build.sh"]
-  , "deps":
-    [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
   , "repos":
     [ "serve-target-remote-build (repo)"
     , "serve-target-remote-build (rule)"
@@ -15,8 +14,8 @@
   , "name": ["serve-target-failed-build"]
   , "test": ["serve_target_failed_build.sh"]
   , "deps":
-    [ ["end-to-end", "tool-under-test"]
-    , ["end-to-end", "mr-tool-under-test"]
+    [ ["", "tool-under-test"]
+    , ["", "mr-tool-under-test"]
     , "serve-tree (archive)"
     , "data/targets/TARGETS"
     , "data/rules/RULES"
@@ -56,28 +55,25 @@
   { "type": ["end-to-end", "with serve"]
   , "name": ["serve-target-cache-hit"]
   , "test": ["serve_target_cache_hit.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   }
 , "serve-start-execute":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["serve-start-execute"]
   , "test": ["serve_start_execute.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "serve-start-execute-sharding":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["serve-start-execute-sharding"]
   , "test": ["serve_start_execute_sharding.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   }
 , "serve-export-deps":
   { "type": ["end-to-end", "with serve"]
   , "name": ["serve-export-deps"]
   , "test": ["serve_export_deps.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   }
 , "serve-tree (data)":
   {"type": "install", "dirs": [["serve-target-remote-build (repo)", "repo"]]}
@@ -92,8 +88,8 @@
   , "name": ["serve-tree"]
   , "test": ["serve-tree.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "serve-tree (archive)"
     , "data/targets/TARGETS.tree"
     ]
@@ -108,16 +104,14 @@
   { "type": ["end-to-end", "with serve"]
   , "name": ["serve-target-remote-build-dispatch"]
   , "test": ["serve_target_remote_build_dispatch.sh"]
-  , "deps":
-    [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
   , "repos": ["serve-target-remote-build-dispatch (data)"]
   }
 , "serve-query-target-cache-value":
   { "type": ["end-to-end", "with serve"]
   , "name": ["serve-query-target-cache-value"]
   , "test": ["serve_query_target_cache_value.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   }
 , "describe (data)":
   { "type": "install"
@@ -130,8 +124,8 @@
   , "name": ["describe"]
   , "test": ["describe.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "describe (locally installed)"
     ]
   , "repos": ["describe (data)"]
@@ -146,8 +140,8 @@
   , "name": ["failure-report"]
   , "test": ["failure-report.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "describe (locally installed)"
     ]
   , "repos": ["failure-report (data)"]
@@ -166,8 +160,7 @@
   { "type": ["end-to-end", "with serve"]
   , "name": ["serve-many-targets"]
   , "test": ["serve_many_targets.sh"]
-  , "deps":
-    [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
   , "repos":
     ["serve-many-targets (data)", "serve-many-targets (data in module)"]
   }
@@ -175,8 +168,7 @@
   { "type": ["end-to-end", "with serve"]
   , "name": ["deduplication-of-serve-requests"]
   , "test": ["deduplication_of_serve_requests.sh"]
-  , "deps":
-    [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
   , "repos": ["serve-many-targets (data)"]
   }
 , "TESTS (unconfigured)":
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 f5753214..a133956b 100644
--- a/test/end-to-end/serve-service/serve-archive-root/TARGETS
+++ b/test/end-to-end/serve-service/serve-archive-root/TARGETS
@@ -17,8 +17,8 @@
   , "name": ["unresolved-present"]
   , "test": ["unresolved-present.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , ["end-to-end/serve-service", "serve-tree (archive)"]
     ]
   , "repos": [["end-to-end/serve-service", "serve-tree (archive)"]]
@@ -28,8 +28,8 @@
   , "name": ["unresolved-absent"]
   , "test": ["unresolved-absent.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , ["end-to-end/serve-service", "serve-tree (archive)"]
     ]
   , "repos": [["end-to-end/serve-service", "serve-tree (archive)"]]
@@ -39,8 +39,8 @@
   , "name": ["unresolved-absent-known"]
   , "test": ["unresolved-absent-known.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , ["end-to-end/serve-service", "serve-tree (archive)"]
     ]
   , "repos": [["end-to-end/serve-service", "serve-tree (archive)"]]
@@ -50,8 +50,8 @@
   , "name": ["unresolved-absent-known-upload"]
   , "test": ["unresolved-absent-known-upload.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , ["end-to-end/serve-service", "serve-tree (archive)"]
     ]
   }
@@ -60,8 +60,8 @@
   , "name": ["resolved-present"]
   , "test": ["resolved-present.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "serve-tree-syms (archive)"
     ]
   , "repos": ["serve-tree-syms (archive)"]
@@ -71,8 +71,8 @@
   , "name": ["resolved-absent"]
   , "test": ["resolved-absent.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "serve-tree-syms (archive)"
     ]
   , "repos": ["serve-tree-syms (archive)"]
@@ -82,8 +82,8 @@
   , "name": ["resolved-absent-known"]
   , "test": ["resolved-absent-known.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "serve-tree-syms (archive)"
     ]
   , "repos": ["serve-tree-syms (archive)"]
@@ -93,8 +93,8 @@
   , "name": ["resolved-absent-known-upload"]
   , "test": ["resolved-absent-known-upload.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "serve-tree-syms (archive)"
     ]
   }
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 1240f53b..8cff743a 100644
--- a/test/end-to-end/serve-service/serve-distdir-root/TARGETS
+++ b/test/end-to-end/serve-service/serve-distdir-root/TARGETS
@@ -16,8 +16,8 @@
   , "name": ["present"]
   , "test": ["present.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "serve-distdir (data)"
     ]
   , "repos": ["serve-distdir (data)"]
@@ -27,8 +27,8 @@
   , "name": ["absent"]
   , "test": ["absent.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "serve-distdir (data)"
     ]
   , "repos": ["serve-distdir (data)"]
@@ -38,8 +38,8 @@
   , "name": ["upload"]
   , "test": ["upload.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "serve-distdir (data)"
     ]
   }
@@ -48,8 +48,8 @@
   , "name": ["foreign-file"]
   , "test": ["foreign-file.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , ["TREE", null, "foreign-file-data"]
     ]
   , "repos": [["TREE", null, "foreign-file-data"]]
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 b4d686e5..1c51a3e7 100644
--- a/test/end-to-end/serve-service/serve-file-root/TARGETS
+++ b/test/end-to-end/serve-service/serve-file-root/TARGETS
@@ -3,8 +3,8 @@
   , "name": ["upload"]
   , "test": ["upload.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , ["end-to-end/serve-service", "serve-tree (archive)"]
     ]
   }
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 db390833..d8d6b9db 100644
--- a/test/end-to-end/serve-service/serve-git-root/TARGETS
+++ b/test/end-to-end/serve-service/serve-git-root/TARGETS
@@ -2,16 +2,14 @@
   { "type": ["end-to-end", "with serve"]
   , "name": ["present"]
   , "test": ["present.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   , "repos": [["end-to-end/serve-service", "serve-tree (data)"]]
   }
 , "absent":
   { "type": ["end-to-end", "with serve"]
   , "name": ["absent"]
   , "test": ["absent.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   , "repos": [["end-to-end/serve-service", "serve-tree (data)"]]
   }
 , "absent-upload":
@@ -19,8 +17,8 @@
   , "name": ["absent-upload"]
   , "test": ["absent-upload.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , ["end-to-end/serve-service", "serve-tree (archive)"]
     ]
   }
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 664c08c4..143aa7a4 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
@@ -2,16 +2,14 @@
   { "type": ["end-to-end", "with serve"]
   , "name": ["present"]
   , "test": ["present.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   , "repos": [["end-to-end/serve-service", "serve-tree (data)"]]
   }
 , "absent":
   { "type": ["end-to-end", "with serve"]
   , "name": ["absent"]
   , "test": ["absent.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   , "repos": [["end-to-end/serve-service", "serve-tree (data)"]]
   }
 , "TESTS":