Link build_engine tests to overall test target

3 files changed, 20 insertions, 10 deletions

diff --git a/test/buildtool/TARGETS b/test/buildtool/TARGETS
index 084adec6..3e70f462 100644
--- a/test/buildtool/TARGETS
+++ b/test/buildtool/TARGETS
@@ -2,7 +2,8 @@
   { "type": "install"
   , "tainted": ["test"]
   , "dirs":
-    [ [["./", "common", "TESTS"], "common"]
+    [ [["./", "build_engine", "TESTS"], "build_engine"]
+    , [["./", "common", "TESTS"], "common"]
     , [["./", "crypto", "TESTS"], "crypto"]
     , [["./", "execution_api", "TESTS"], "execution_api"]
     , [["./", "execution_engine", "TESTS"], "execution_engine"]
@@ -12,4 +13,4 @@
     , [["./", "multithreading", "TESTS"], "multithreading"]
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/test/buildtool/build_engine/TARGETS b/test/buildtool/build_engine/TARGETS
new file mode 100644
index 00000000..bcfcf41d
--- /dev/null
+++ b/test/buildtool/build_engine/TARGETS
@@ -0,0 +1,10 @@
+{ "TESTS":
+  { "type": "install"
+  , "tainted": ["test"]
+  , "dirs":
+    [ [["./", "base_maps", "TESTS"], "base_maps"]
+    , [["./", "expression", "TESTS"], "expression"]
+    , [["./", "target_map", "TESTS"], "target_map"]
+    ]
+  }
+}
diff --git a/test/buildtool/build_engine/base_maps/TARGETS b/test/buildtool/build_engine/base_maps/TARGETS
index 042ca0b3..a55d1762 100644
--- a/test/buildtool/build_engine/base_maps/TARGETS
+++ b/test/buildtool/build_engine/base_maps/TARGETS
@@ -23,7 +23,7 @@
   { "type": ["@", "rules", "CC/test", "test"]
   , "name": ["directory_map"]
   , "srcs": ["directory_map.test.cpp"]
-  , "data": ["test_data_src"]
+  , "data": ["test_data_src", "test_data"]
   , "deps":
     [ "test_repo"
     , ["@", "catch2", "", "catch2"]
@@ -37,7 +37,7 @@
   { "type": ["@", "rules", "CC/test", "test"]
   , "name": ["json_file_map"]
   , "srcs": ["json_file_map.test.cpp"]
-  , "data": ["test_data_json"]
+  , "data": ["test_data_json", "test_data"]
   , "deps":
     [ "test_repo"
     , ["@", "catch2", "", "catch2"]
@@ -50,7 +50,7 @@
   { "type": ["@", "rules", "CC/test", "test"]
   , "name": ["source_map"]
   , "srcs": ["source_map.test.cpp"]
-  , "data": ["test_data"]
+  , "data": ["test_data", "test_data_src"]
   , "deps":
     [ "test_repo"
     , ["@", "catch2", "", "catch2"]
@@ -64,7 +64,7 @@
   { "type": ["@", "rules", "CC/test", "test"]
   , "name": ["expression_map"]
   , "srcs": ["expression_map.test.cpp"]
-  , "data": ["test_data_expr"]
+  , "data": ["test_data_expr", "test_data"]
   , "deps":
     [ "test_repo"
     , ["@", "catch2", "", "catch2"]
@@ -77,7 +77,7 @@
   { "type": ["@", "rules", "CC/test", "test"]
   , "name": ["rule_map"]
   , "srcs": ["rule_map.test.cpp"]
-  , "data": ["test_data_rule"]
+  , "data": ["test_data_rule", "test_data"]
   , "deps":
     [ "test_repo"
     , ["@", "catch2", "", "catch2"]
@@ -108,8 +108,7 @@
   }
 , "test_data":
   { "type": ["@", "rules", "data", "staged"]
-  , "srcs":
-    ["test_data_src", "test_data_json", "test_data_expr", "test_data_rule"]
+  , "srcs": ["data/test_repo.bundle"]
   , "stage": ["test", "buildtool", "build_engine", "base_maps"]
   }
 , "TESTS":
@@ -124,4 +123,4 @@
     , "source_map"
     ]
   }
-}
\ No newline at end of file
+}