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.

1 files changed, 9 insertions, 11 deletions

diff --git a/test/end-to-end/remote-execution/TARGETS b/test/end-to-end/remote-execution/TARGETS
index 45dc50d5..1cd3b1a7 100644
--- a/test/end-to-end/remote-execution/TARGETS
+++ b/test/end-to-end/remote-execution/TARGETS
@@ -2,38 +2,37 @@
   { "type": ["end-to-end", "with remote"]
   , "name": ["native-protocol"]
   , "test": ["native-protocol.sh"]
-  , "deps":
-    [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
   }
 , "large-blobs":
   { "type": ["end-to-end", "with remote"]
   , "name": ["large-blobs"]
   , "test": ["large-blobs.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "upload-test":
   { "type": ["end-to-end", "with remote"]
   , "name": ["upload-test"]
   , "test": ["upload-test.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "install":
   { "type": ["end-to-end", "with remote"]
   , "name": ["install"]
   , "test": ["install.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "execute":
   { "type": ["end-to-end", "with remote"]
   , "name": ["execute"]
   , "test": ["execute.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "install-cas":
   { "type": ["end-to-end", "with remote"]
   , "name": ["install-cas"]
   , "test": ["install-cas.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   , "keep":
     [ "out/stdout/remote"
     , "out/stdout/remote-raw"
@@ -45,13 +44,13 @@
   { "type": ["end-to-end", "with remote"]
   , "name": ["dispatch"]
   , "test": ["dispatch.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "split-splice (raw)":
   { "type": ["end-to-end", "with remote"]
   , "name": ["split-splice"]
   , "test": ["split-splice.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "split-splice":
   { "type": "configure"
@@ -71,8 +70,7 @@
   { "type": ["end-to-end", "with remote"]
   , "name": ["add-to-cas"]
   , "test": ["add-to-cas.sh"]
-  , "deps":
-    [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
   }
 , "TESTS":
   { "type": "install"