1 files changed, 14 insertions, 6 deletions
diff --git a/test/buildtool/file_system/TARGETS b/test/buildtool/file_system/TARGETS
index 4210a13a..53c15fcc 100644
--- a/test/buildtool/file_system/TARGETS
+++ b/test/buildtool/file_system/TARGETS
@@ -5,10 +5,12 @@
   , "data": ["test_data"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
+    , ["@", "fmt", "", "fmt"]
     , ["@", "src", "src/buildtool/file_system", "file_system_manager"]
     , ["@", "src", "src/buildtool/file_system", "object_type"]
     , ["@", "src", "src/buildtool/logging", "log_level"]
     , ["@", "src", "src/buildtool/logging", "logging"]
+    , ["@", "src", "src/buildtool/system", "system"]
     , ["", "catch-main"]
     ]
   , "stage": ["test", "buildtool", "file_system"]
@@ -19,8 +21,10 @@
   , "srcs": ["object_cas.test.cpp"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
+    , ["@", "gsl", "", "gsl"]
     , ["@", "src", "src/buildtool/common", "artifact_digest_factory"]
     , ["@", "src", "src/buildtool/common", "common"]
+    , ["@", "src", "src/buildtool/crypto", "hash_function"]
     , ["@", "src", "src/buildtool/file_system", "file_system_manager"]
     , ["@", "src", "src/buildtool/file_system", "object_cas"]
     , ["@", "src", "src/buildtool/file_system", "object_type"]
@@ -38,12 +42,16 @@
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
     , ["@", "fmt", "", "fmt"]
+    , ["@", "gsl", "", "gsl"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/file_system", "file_system_manager"]
     , ["@", "src", "src/buildtool/file_system", "git_cas"]
     , ["@", "src", "src/buildtool/file_system", "git_repo"]
     , ["@", "src", "src/buildtool/file_system", "git_tree"]
+    , ["@", "src", "src/buildtool/file_system", "object_type"]
+    , ["@", "src", "src/utils/cpp", "atomic"]
     , ["@", "src", "src/utils/cpp", "hex_string"]
+    , ["@", "src", "src/utils/cpp", "path"]
     , ["", "catch-main"]
     , ["utils", "container_matchers"]
     , ["utils", "shell_quoting"]
@@ -57,14 +65,17 @@
   , "data": ["test_data"]
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
+    , ["@", "fmt", "", "fmt"]
     , ["@", "src", "src/buildtool/common", "artifact_description"]
     , ["@", "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/file_system", "file_root"]
     , ["@", "src", "src/buildtool/file_system", "file_system_manager"]
+    , ["@", "src", "src/buildtool/file_system", "object_type"]
+    , ["@", "src", "src/utils/cpp", "expected"]
     , ["", "catch-main"]
-    , ["utils", "container_matchers"]
     , ["utils", "shell_quoting"]
     , ["utils", "test_hash_function_type"]
     ]
@@ -78,11 +89,9 @@
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
     , ["@", "fmt", "", "fmt"]
-    , ["@", "src", "src/buildtool/common", "artifact_description"]
     , ["@", "src", "src/buildtool/file_system", "file_root"]
     , ["@", "src", "src/buildtool/file_system", "file_system_manager"]
     , ["", "catch-main"]
-    , ["utils", "container_matchers"]
     , ["utils", "shell_quoting"]
     ]
   , "stage": ["test", "buildtool", "file_system"]
@@ -118,14 +127,14 @@
   , "private-deps":
     [ ["@", "catch2", "", "catch2"]
     , ["@", "fmt", "", "fmt"]
-    , ["@", "json", "", "json"]
     , ["@", "src", "src/buildtool/file_system", "file_system_manager"]
     , ["@", "src", "src/buildtool/file_system", "git_cas"]
     , ["@", "src", "src/buildtool/file_system", "git_repo"]
+    , ["@", "src", "src/buildtool/file_system", "object_type"]
     , ["@", "src", "src/buildtool/logging", "log_level"]
     , ["@", "src", "src/buildtool/logging", "logging"]
-    , ["@", "src", "src/buildtool/storage", "config"]
     , ["@", "src", "src/utils/cpp", "atomic"]
+    , ["@", "src", "src/utils/cpp", "expected"]
     , ["@", "src", "src/utils/cpp", "hex_string"]
     , ["", "catch-main"]
     , ["utils", "shell_quoting"]
@@ -143,7 +152,6 @@
     , ["@", "fmt", "", "fmt"]
     , ["@", "src", "src/buildtool/file_system", "file_system_manager"]
     , ["@", "src", "src/buildtool/file_system", "git_cas"]
-    , ["@", "src", "src/buildtool/file_system", "git_repo"]
     , ["@", "src", "src/buildtool/file_system", "object_type"]
     , ["@", "src", "src/buildtool/file_system/symlinks_map", "pragma_special"]
     , [ "@"