Add dependencies explicitly that are included directly

... instead of relying on those dependencies being pulled in
indirectly.

12 files changed, 34 insertions, 0 deletions

diff --git a/test/bootstrap/TARGETS b/test/bootstrap/TARGETS
index 288ed52d..690b20e9 100644
--- a/test/bootstrap/TARGETS
+++ b/test/bootstrap/TARGETS
@@ -60,6 +60,7 @@
     , ["@", "protoc", "", "protoc"]
     , ["@", "protoc", "", "libprotobuf"]
     , ["@", "grpc", "", "grpc++"]
+    , ["@", "grpc", "", "grpc"]
     , ["@", "grpc", "", "grpc_cpp_plugin"]
     , ["@", "src", "", "libarchive"]
     ]
diff --git a/test/buildtool/build_engine/base_maps/TARGETS b/test/buildtool/build_engine/base_maps/TARGETS
index faecc784..e243290c 100644
--- a/test/buildtool/build_engine/base_maps/TARGETS
+++ b/test/buildtool/build_engine/base_maps/TARGETS
@@ -32,6 +32,7 @@
     , ["@", "src", "src/buildtool/build_engine/base_maps", "module_name"]
     , ["@", "src", "src/buildtool/common", "config"]
     , ["@", "src", "src/buildtool/file_system", "file_root"]
+    , ["@", "src", "src/buildtool/multithreading", "task_system"]
     , ["", "catch-main"]
     ]
   , "stage": ["test", "buildtool", "build_engine", "base_maps"]
@@ -62,12 +63,15 @@
     , ["@", "catch2", "", "catch2"]
     , ["@", "json", "", "json"]
     , ["@", "src", "src/buildtool/build_engine/base_maps", "directory_map"]
+    , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name"]
     , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name_data"]
     , ["@", "src", "src/buildtool/build_engine/base_maps", "source_map"]
     , ["@", "src", "src/buildtool/common", "config"]
     , ["@", "src", "src/buildtool/common", "protocol_traits"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
     , ["@", "src", "src/buildtool/file_system", "file_root"]
+    , ["@", "src", "src/buildtool/multithreading", "async_map_consumer"]
+    , ["@", "src", "src/buildtool/multithreading", "task_system"]
     , ["", "catch-main"]
     , ["utils", "test_hash_function_type"]
     ]
diff --git a/test/buildtool/build_engine/expression/TARGETS b/test/buildtool/build_engine/expression/TARGETS
index 01f7e610..1b994a02 100644
--- a/test/buildtool/build_engine/expression/TARGETS
+++ b/test/buildtool/build_engine/expression/TARGETS
@@ -17,6 +17,12 @@
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
     , ["@", "src", "src/buildtool/build_engine/expression", "expression"]
+    , [ "@"
+      , "src"
+      , "src/buildtool/build_engine/expression"
+      , "expression_ptr_interface"
+      ]
+    , ["@", "src", "src/buildtool/common", "artifact_description"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["", "catch-main"]
     , ["utils", "container_matchers"]
diff --git a/test/buildtool/build_engine/target_map/TARGETS b/test/buildtool/build_engine/target_map/TARGETS
index f1de7752..f2d50fce 100644
--- a/test/buildtool/build_engine/target_map/TARGETS
+++ b/test/buildtool/build_engine/target_map/TARGETS
@@ -25,20 +25,26 @@
     [ ["@", "catch2", "", "catch2"]
     , ["@", "src", "src/buildtool/auth", "auth"]
     , ["@", "src", "src/buildtool/build_engine/base_maps", "directory_map"]
+    , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name"]
+    , ["@", "src", "src/buildtool/build_engine/base_maps", "expression_map"]
     , ["@", "src", "src/buildtool/build_engine/base_maps", "rule_map"]
     , ["@", "src", "src/buildtool/build_engine/base_maps", "source_map"]
     , ["@", "src", "src/buildtool/build_engine/base_maps", "targets_file_map"]
+    , ["@", "src", "src/buildtool/build_engine/expression", "expression"]
     , ["@", "src", "src/buildtool/build_engine/target_map", "target_map"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/common", "config"]
     , ["@", "src", "src/buildtool/common/remote", "retry_config"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
+    , ["@", "src", "src/buildtool/execution_api/common", "api_bundle"]
     , ["@", "src", "src/buildtool/execution_api/local", "config"]
     , ["@", "src", "src/buildtool/execution_api/local", "context"]
     , ["@", "src", "src/buildtool/execution_api/remote", "config"]
     , ["@", "src", "src/buildtool/execution_api/remote", "context"]
     , ["@", "src", "src/buildtool/file_system", "file_root"]
     , ["@", "src", "src/buildtool/main", "analyse_context"]
+    , ["@", "src", "src/buildtool/multithreading", "async_map_consumer"]
+    , ["@", "src", "src/buildtool/multithreading", "task_system"]
     , ["@", "src", "src/buildtool/progress_reporting", "progress"]
     , ["@", "src", "src/buildtool/serve_api/remote", "config"]
     , ["@", "src", "src/buildtool/serve_api/remote", "serve_api"]
diff --git a/test/buildtool/common/TARGETS b/test/buildtool/common/TARGETS
index bec2d031..298f93eb 100644
--- a/test/buildtool/common/TARGETS
+++ b/test/buildtool/common/TARGETS
@@ -23,6 +23,7 @@
     [ ["@", "catch2", "", "catch2"]
     , ["@", "json", "", "json"]
     , ["@", "src", "src/buildtool/common", "action_description"]
+    , ["@", "src", "src/buildtool/common", "artifact_description"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
     , ["", "catch-main"]
diff --git a/test/buildtool/execution_api/bazel/TARGETS b/test/buildtool/execution_api/bazel/TARGETS
index 883fc1a6..7f0bd860 100644
--- a/test/buildtool/execution_api/bazel/TARGETS
+++ b/test/buildtool/execution_api/bazel/TARGETS
@@ -45,9 +45,11 @@
   , "srcs": ["bytestream_client.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
+    , ["@", "src", "src/buildtool/auth", "auth"]
     , ["@", "src", "src/buildtool/common", "bazel_digest_factory"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
     , ["@", "src", "src/buildtool/execution_api/common", "bytestream_utils"]
+    , ["@", "src", "src/buildtool/execution_api/common", "common"]
     , ["@", "src", "src/buildtool/execution_api/remote", "bazel_network"]
     , ["@", "src", "src/buildtool/execution_api/remote", "config"]
     , ["@", "src", "src/buildtool/file_system", "object_type"]
@@ -65,6 +67,7 @@
   , "srcs": ["bazel_network.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
+    , ["@", "src", "src/buildtool/auth", "auth"]
     , ["@", "src", "src/buildtool/common", "bazel_digest_factory"]
     , ["@", "src", "src/buildtool/common", "protocol_traits"]
     , ["@", "src", "src/buildtool/common/remote", "retry_config"]
@@ -119,6 +122,7 @@
     , ["@", "src", "src/buildtool/common/remote", "retry_config"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
     , ["@", "src", "src/buildtool/execution_api/remote", "bazel"]
+    , ["@", "src", "src/buildtool/execution_api/remote", "config"]
     , ["buildtool/execution_api/common", "api_test"]
     , ["utils", "catch-main-remote-execution"]
     , ["utils", "test_auth_config"]
diff --git a/test/buildtool/execution_api/common/TARGETS b/test/buildtool/execution_api/common/TARGETS
index a2bb8a82..13b393e3 100644
--- a/test/buildtool/execution_api/common/TARGETS
+++ b/test/buildtool/execution_api/common/TARGETS
@@ -41,6 +41,7 @@
     , ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/common", "protocol_traits"]
+    , ["@", "src", "src/buildtool/crypto", "hash_function"]
     , [ "@"
       , "src"
       , "src/buildtool/execution_api/bazel_msg"
diff --git a/test/buildtool/execution_engine/executor/TARGETS b/test/buildtool/execution_engine/executor/TARGETS
index 3683a9d4..cc3e94d7 100644
--- a/test/buildtool/execution_engine/executor/TARGETS
+++ b/test/buildtool/execution_engine/executor/TARGETS
@@ -9,6 +9,8 @@
     , ["@", "src", "src/buildtool/common", "artifact_description"]
     , ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
     , ["@", "src", "src/buildtool/common", "common"]
+    , ["@", "src", "src/buildtool/common", "config"]
+    , ["@", "src", "src/buildtool/common/remote", "retry_config"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
     , ["@", "src", "src/buildtool/execution_api/common", "common"]
     , ["@", "src", "src/buildtool/execution_api/remote", "config"]
@@ -44,6 +46,7 @@
     , ["@", "src", "src/buildtool/execution_engine/dag", "dag"]
     , ["@", "src", "src/buildtool/execution_engine/executor", "context"]
     , ["@", "src", "src/buildtool/execution_engine/executor", "executor"]
+    , ["@", "src", "src/buildtool/file_system", "file_system_manager"]
     , ["@", "src", "src/buildtool/progress_reporting", "progress"]
     , ["@", "src", "src/utils/cpp", "expected"]
     , ["", "catch-main"]
diff --git a/test/buildtool/graph_traverser/TARGETS b/test/buildtool/graph_traverser/TARGETS
index 7a437e9a..5e5633d5 100644
--- a/test/buildtool/graph_traverser/TARGETS
+++ b/test/buildtool/graph_traverser/TARGETS
@@ -4,6 +4,7 @@
   , "hdrs": ["graph_traverser.test.hpp"]
   , "deps":
     [ ["@", "catch2", "", "catch2"]
+    , ["@", "gsl", "", "gsl"]
     , ["@", "json", "", "json"]
     , ["@", "src", "src/buildtool/auth", "auth"]
     , ["@", "src", "src/buildtool/common", "common"]
@@ -23,6 +24,7 @@
     , ["@", "src", "src/buildtool/progress_reporting", "progress"]
     , ["@", "src", "src/buildtool/storage", "config"]
     , ["@", "src", "src/buildtool/storage", "storage"]
+    , ["@", "src", "src/utils/cpp", "json"]
     , ["utils", "test_hash_function_type"]
     ]
   , "stage": ["test", "buildtool", "graph_traverser"]
@@ -35,6 +37,7 @@
   , "private-deps":
     [ "graph_traverser_tests"
     , ["@", "catch2", "", "catch2"]
+    , ["@", "src", "src/buildtool/auth", "auth"]
     , ["@", "src", "src/buildtool/common", "protocol_traits"]
     , ["@", "src", "src/buildtool/execution_api/remote", "config"]
     , ["@", "src", "src/buildtool/storage", "config"]
@@ -54,6 +57,7 @@
     [ "graph_traverser_tests"
     , ["@", "catch2", "", "catch2"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
+    , ["@", "src", "src/buildtool/execution_api/remote", "config"]
     , ["@", "src", "src/buildtool/storage", "config"]
     , ["@", "src", "src/buildtool/storage", "storage"]
     , ["utils", "catch-main-remote-execution"]
diff --git a/test/buildtool/multithreading/TARGETS b/test/buildtool/multithreading/TARGETS
index 0ff7f635..bd501759 100644
--- a/test/buildtool/multithreading/TARGETS
+++ b/test/buildtool/multithreading/TARGETS
@@ -4,6 +4,7 @@
   , "srcs": ["task.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
+    , ["@", "src", "src/buildtool/multithreading", "task"]
     , ["@", "src", "src/buildtool/multithreading", "task_system"]
     , ["", "catch-main"]
     ]
diff --git a/test/buildtool/storage/TARGETS b/test/buildtool/storage/TARGETS
index 214c1fa8..d3cc1c4c 100644
--- a/test/buildtool/storage/TARGETS
+++ b/test/buildtool/storage/TARGETS
@@ -33,6 +33,7 @@
   , "srcs": ["local_ac.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
+    , ["@", "gsl", "", "gsl"]
     , ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
     , ["@", "src", "src/buildtool/common", "bazel_types"]
     , ["@", "src", "src/buildtool/common", "common"]
diff --git a/test/utils/TARGETS b/test/utils/TARGETS
index 409ce392..7d8f7148 100644
--- a/test/utils/TARGETS
+++ b/test/utils/TARGETS
@@ -14,11 +14,13 @@
     , "test_env"
     , "test_remote_config"
     , ["@", "gsl", "", "gsl"]
+    , ["@", "src", "src/buildtool/auth", "auth"]
     , ["@", "src", "src/buildtool/common", "bazel_digest_factory"]
     , ["@", "src", "src/buildtool/common", "bazel_types"]
     , ["@", "src", "src/buildtool/common/remote", "retry_config"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
     , ["@", "src", "src/buildtool/execution_api/remote", "bazel_network"]
+    , ["@", "src", "src/buildtool/execution_api/remote", "config"]
     ]
   , "stage": ["test", "utils"]
   }