diff options
53 files changed, 211 insertions, 159 deletions
diff --git a/test/TARGETS b/test/TARGETS index b96c461e..30878fb0 100644 --- a/test/TARGETS +++ b/test/TARGETS @@ -46,21 +46,20 @@ , "stage": ["test"] } , "TESTS": - { "type": "install" + { "type": ["@", "rules", "test", "suite"] , "arguments_config": ["DROP_LARGE_TESTS"] - , "tainted": ["test"] - , "dirs": + , "deps": { "type": "++" , "$1": - [ [ [["./", "buildtool", "TESTS"], "buildtool"] - , [["./", "utils", "TESTS"], "utils"] - , [["./", "end-to-end", "TESTS"], "end-to-end"] - , [["./", "other_tools", "TESTS"], "other_tools"] + [ [ ["./", "buildtool", "TESTS"] + , ["./", "utils", "TESTS"] + , ["./", "end-to-end", "TESTS"] + , ["./", "other_tools", "TESTS"] ] , { "type": "if" , "cond": {"type": "var", "name": "DROP_LARGE_TESTS"} , "then": [] - , "else": [["bootstrap-test", "bootstrap"]] + , "else": ["bootstrap-test"] } ] } diff --git a/test/bootstrap/TARGETS b/test/bootstrap/TARGETS index 1bf2c431..2739c40a 100644 --- a/test/bootstrap/TARGETS +++ b/test/bootstrap/TARGETS @@ -101,8 +101,8 @@ , "deps": ["distro-bootstrap-deps", "staged-sources"] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["bootstrap"] , "deps": [ "bundled-test" , "bundled-test-debug" diff --git a/test/buildtool/TARGETS b/test/buildtool/TARGETS index 727c13da..84673a9d 100644 --- a/test/buildtool/TARGETS +++ b/test/buildtool/TARGETS @@ -1,20 +1,20 @@ { "TESTS": - { "type": "install" - , "tainted": ["test"] - , "dirs": - [ [["./", "build_engine", "TESTS"], "build_engine"] - , [["./", "common", "TESTS"], "common"] - , [["./", "crypto", "TESTS"], "crypto"] - , [["./", "execution_api", "TESTS"], "execution_api"] - , [["./", "execution_engine", "TESTS"], "execution_engine"] - , [["./", "file_system", "TESTS"], "file_system"] - , [["./", "graph_traverser", "TESTS"], "graph_traverser"] - , [["./", "logging", "TESTS"], "logging"] - , [["./", "main", "TESTS"], "main"] - , [["./", "multithreading", "TESTS"], "multithreading"] - , [["./", "serve_api", "TESTS"], "serve_api"] - , [["./", "storage", "TESTS"], "storage"] - , [["./", "system", "TESTS"], "system"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["buildtool"] + , "deps": + [ ["./", "build_engine", "TESTS"] + , ["./", "common", "TESTS"] + , ["./", "crypto", "TESTS"] + , ["./", "execution_api", "TESTS"] + , ["./", "execution_engine", "TESTS"] + , ["./", "file_system", "TESTS"] + , ["./", "graph_traverser", "TESTS"] + , ["./", "logging", "TESTS"] + , ["./", "main", "TESTS"] + , ["./", "multithreading", "TESTS"] + , ["./", "serve_api", "TESTS"] + , ["./", "storage", "TESTS"] + , ["./", "system", "TESTS"] ] } } diff --git a/test/buildtool/build_engine/TARGETS b/test/buildtool/build_engine/TARGETS index bcfcf41d..a3856ffa 100644 --- a/test/buildtool/build_engine/TARGETS +++ b/test/buildtool/build_engine/TARGETS @@ -1,10 +1,10 @@ { "TESTS": - { "type": "install" - , "tainted": ["test"] - , "dirs": - [ [["./", "base_maps", "TESTS"], "base_maps"] - , [["./", "expression", "TESTS"], "expression"] - , [["./", "target_map", "TESTS"], "target_map"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["build_engine"] + , "deps": + [ ["./", "base_maps", "TESTS"] + , ["./", "expression", "TESTS"] + , ["./", "target_map", "TESTS"] ] } } diff --git a/test/buildtool/build_engine/base_maps/TARGETS b/test/buildtool/build_engine/base_maps/TARGETS index c6b683fb..855d6217 100644 --- a/test/buildtool/build_engine/base_maps/TARGETS +++ b/test/buildtool/build_engine/base_maps/TARGETS @@ -142,8 +142,8 @@ , "cmds": ["sh create_maps_test_git_bundle.sh"] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["base_maps"] , "deps": [ "directory_map" , "entity_name" diff --git a/test/buildtool/build_engine/expression/TARGETS b/test/buildtool/build_engine/expression/TARGETS index e7d15616..9284aba3 100644 --- a/test/buildtool/build_engine/expression/TARGETS +++ b/test/buildtool/build_engine/expression/TARGETS @@ -36,8 +36,8 @@ , "stage": ["test", "buildtool", "build_engine", "expression"] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["expression"] , "deps": ["configuration", "expression", "linked_map"] } } diff --git a/test/buildtool/build_engine/target_map/TARGETS b/test/buildtool/build_engine/target_map/TARGETS index f87cc475..6db3919e 100644 --- a/test/buildtool/build_engine/target_map/TARGETS +++ b/test/buildtool/build_engine/target_map/TARGETS @@ -106,8 +106,8 @@ , "stage": ["test", "buildtool", "build_engine", "target_map"] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["target_map"] , "deps": ["result_map", "target_map", "target_map_internals"] } } diff --git a/test/buildtool/common/TARGETS b/test/buildtool/common/TARGETS index 00868a33..90d3742c 100644 --- a/test/buildtool/common/TARGETS +++ b/test/buildtool/common/TARGETS @@ -45,8 +45,8 @@ , "stage": ["test", "buildtool", "common"] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["common"] , "deps": ["action_description", "artifact_description", "repository_config"] } } diff --git a/test/buildtool/crypto/TARGETS b/test/buildtool/crypto/TARGETS index c4177579..b05af69b 100644 --- a/test/buildtool/crypto/TARGETS +++ b/test/buildtool/crypto/TARGETS @@ -21,5 +21,8 @@ , "stage": ["test", "buildtool", "crypto"] } , "TESTS": - {"type": "install", "tainted": ["test"], "deps": ["hasher", "hash_function"]} + { "type": ["@", "rules", "test", "suite"] + , "stage": ["crypto"] + , "deps": ["hasher", "hash_function"] + } } diff --git a/test/buildtool/execution_api/TARGETS b/test/buildtool/execution_api/TARGETS index 5372a41e..1368ac08 100644 --- a/test/buildtool/execution_api/TARGETS +++ b/test/buildtool/execution_api/TARGETS @@ -9,12 +9,12 @@ , "stage": ["test", "buildtool", "execution_api"] } , "TESTS": - { "type": "install" - , "tainted": ["test"] - , "dirs": - [ [["./", "bazel", "TESTS"], "bazel"] - , [["./", "local", "TESTS"], "local"] - , [["./", "execution_service", "TESTS"], "execution_service"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["execution_api"] + , "deps": + [ ["./", "bazel", "TESTS"] + , ["./", "local", "TESTS"] + , ["./", "execution_service", "TESTS"] ] } } diff --git a/test/buildtool/execution_api/bazel/TARGETS b/test/buildtool/execution_api/bazel/TARGETS index 4cd01735..90bddd80 100644 --- a/test/buildtool/execution_api/bazel/TARGETS +++ b/test/buildtool/execution_api/bazel/TARGETS @@ -118,8 +118,8 @@ , "stage": ["test", "buildtool", "execution_api", "bazel"] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["bazel"] , "deps": [ "bytestream_client" , "cas_client" diff --git a/test/buildtool/execution_api/execution_service/TARGETS b/test/buildtool/execution_api/execution_service/TARGETS index 6001865c..0e32c4ad 100644 --- a/test/buildtool/execution_api/execution_service/TARGETS +++ b/test/buildtool/execution_api/execution_service/TARGETS @@ -22,5 +22,9 @@ ] , "stage": ["test", "buildtool", "execution_api", "execution_service"] } -, "TESTS": {"type": "install", "tainted": ["test"], "deps": ["cas_server"]} +, "TESTS": + { "type": ["@", "rules", "test", "suite"] + , "stage": ["execution_service"] + , "deps": ["cas_server"] + } } diff --git a/test/buildtool/execution_api/local/TARGETS b/test/buildtool/execution_api/local/TARGETS index 46b5abb1..f88a8ff0 100644 --- a/test/buildtool/execution_api/local/TARGETS +++ b/test/buildtool/execution_api/local/TARGETS @@ -37,8 +37,8 @@ , "stage": ["test", "buildtool", "execution_api", "local"] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["local"] , "deps": ["local_api", "local_execution"] } } diff --git a/test/buildtool/execution_engine/TARGETS b/test/buildtool/execution_engine/TARGETS index 5b8b499d..4cb22944 100644 --- a/test/buildtool/execution_engine/TARGETS +++ b/test/buildtool/execution_engine/TARGETS @@ -1,10 +1,10 @@ { "TESTS": - { "type": "install" - , "tainted": ["test"] - , "dirs": - [ [["./", "dag", "TESTS"], "dag"] - , [["./", "executor", "TESTS"], "executor"] - , [["./", "traverser", "TESTS"], "traverser"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["execution_engine"] + , "deps": + [ ["./", "dag", "TESTS"] + , ["./", "executor", "TESTS"] + , ["./", "traverser", "TESTS"] ] } } diff --git a/test/buildtool/execution_engine/dag/TARGETS b/test/buildtool/execution_engine/dag/TARGETS index 7b30cab4..1baf9f0e 100644 --- a/test/buildtool/execution_engine/dag/TARGETS +++ b/test/buildtool/execution_engine/dag/TARGETS @@ -14,5 +14,6 @@ ] , "stage": ["test", "buildtool", "execution_engine", "dag"] } -, "TESTS": {"type": "install", "tainted": ["test"], "deps": ["dag"]} +, "TESTS": + {"type": ["@", "rules", "test", "suite"], "stage": ["dag"], "deps": ["dag"]} } diff --git a/test/buildtool/execution_engine/executor/TARGETS b/test/buildtool/execution_engine/executor/TARGETS index 39a2c3de..bbdccc7c 100644 --- a/test/buildtool/execution_engine/executor/TARGETS +++ b/test/buildtool/execution_engine/executor/TARGETS @@ -108,8 +108,8 @@ , "stage": ["test", "buildtool", "execution_engine", "executor"] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["executor"] , "deps": ["executor", "local", "remote_bazel"] } } diff --git a/test/buildtool/execution_engine/traverser/TARGETS b/test/buildtool/execution_engine/traverser/TARGETS index 02294710..821c4bc8 100644 --- a/test/buildtool/execution_engine/traverser/TARGETS +++ b/test/buildtool/execution_engine/traverser/TARGETS @@ -13,5 +13,9 @@ ] , "stage": ["test", "buildtool", "execution_engine", "traverser"] } -, "TESTS": {"type": "install", "tainted": ["test"], "deps": ["traverser"]} +, "TESTS": + { "type": ["@", "rules", "test", "suite"] + , "stage": ["traverser"] + , "deps": ["traverser"] + } } diff --git a/test/buildtool/file_system/TARGETS b/test/buildtool/file_system/TARGETS index 20a8c47f..8f474e67 100644 --- a/test/buildtool/file_system/TARGETS +++ b/test/buildtool/file_system/TARGETS @@ -155,8 +155,8 @@ , "stage": ["test", "buildtool", "file_system"] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["file_system"] , "deps": [ "file_root" , "file_system_manager" diff --git a/test/buildtool/graph_traverser/TARGETS b/test/buildtool/graph_traverser/TARGETS index 4079857c..fcf2da20 100644 --- a/test/buildtool/graph_traverser/TARGETS +++ b/test/buildtool/graph_traverser/TARGETS @@ -65,8 +65,8 @@ , "stage": ["test", "buildtool", "graph_traverser"] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["graph_traverser"] , "deps": ["graph_traverser_local", "graph_traverser_remote"] } } diff --git a/test/buildtool/logging/TARGETS b/test/buildtool/logging/TARGETS index 8bc28c1e..bbff8a41 100644 --- a/test/buildtool/logging/TARGETS +++ b/test/buildtool/logging/TARGETS @@ -25,5 +25,8 @@ , "private-ldflags": ["-pthread"] } , "TESTS": - {"type": "install", "tainted": ["test"], "deps": ["log_sink_file", "logger"]} + { "type": ["@", "rules", "test", "suite"] + , "stage": ["logging"] + , "deps": ["log_sink_file", "logger"] + } } diff --git a/test/buildtool/main/TARGETS b/test/buildtool/main/TARGETS index a8f7541d..e0871cf1 100644 --- a/test/buildtool/main/TARGETS +++ b/test/buildtool/main/TARGETS @@ -10,5 +10,9 @@ ] , "stage": ["test", "buildtool", "main"] } -, "TESTS": {"type": "install", "tainted": ["test"], "deps": ["install_cas"]} +, "TESTS": + { "type": ["@", "rules", "test", "suite"] + , "stage": ["main"] + , "deps": ["install_cas"] + } } diff --git a/test/buildtool/multithreading/TARGETS b/test/buildtool/multithreading/TARGETS index c7b28d88..bf4e5e73 100644 --- a/test/buildtool/multithreading/TARGETS +++ b/test/buildtool/multithreading/TARGETS @@ -63,8 +63,8 @@ , "stage": ["test", "buildtool", "multithreading"] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["multithreading"] , "deps": [ "async_map" , "async_map_consumer" diff --git a/test/buildtool/serve_api/TARGETS b/test/buildtool/serve_api/TARGETS index 4e903d83..5c5accdf 100644 --- a/test/buildtool/serve_api/TARGETS +++ b/test/buildtool/serve_api/TARGETS @@ -17,5 +17,8 @@ , "stage": ["test", "buildtool", "serve_api"] } , "TESTS": - {"type": "install", "tainted": ["test"], "deps": ["source_tree_client"]} + { "type": ["@", "rules", "test", "suite"] + , "stage": ["serve_api"] + , "deps": ["source_tree_client"] + } } diff --git a/test/buildtool/storage/TARGETS b/test/buildtool/storage/TARGETS index 4a2881c3..69d13137 100644 --- a/test/buildtool/storage/TARGETS +++ b/test/buildtool/storage/TARGETS @@ -69,8 +69,8 @@ , "stage": ["test", "buildtool", "storage"] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["storage"] , "deps": ["local_cas", "local_ac", "large_object_cas"] } } diff --git a/test/buildtool/system/TARGETS b/test/buildtool/system/TARGETS index bc6610b7..d04bb71f 100644 --- a/test/buildtool/system/TARGETS +++ b/test/buildtool/system/TARGETS @@ -10,5 +10,9 @@ ] , "stage": ["test", "buildtool", "system"] } -, "TESTS": {"type": "install", "tainted": ["test"], "deps": ["system_command"]} +, "TESTS": + { "type": ["@", "rules", "test", "suite"] + , "stage": ["system"] + , "deps": ["system_command"] + } } diff --git a/test/end-to-end/TARGETS b/test/end-to-end/TARGETS index be347ae9..a1b50e46 100644 --- a/test/end-to-end/TARGETS +++ b/test/end-to-end/TARGETS @@ -11,31 +11,31 @@ } } , "TESTS": - { "type": "install" + { "type": ["@", "rules", "test", "suite"] , "arguments_config": ["TEST_BOOTSTRAP_JUST_MR"] - , "tainted": ["test"] - , "dirs": + , "stage": ["end-to-end"] + , "deps": { "type": "++" , "$1": - [ [ [["./", "actions", "TESTS"], "actions"] - , [["./", "cli", "TESTS"], "cli"] - , [["./", "generated-binary", "TESTS"], "generated-binary"] - , [["./", "target-tests", "TESTS"], "targets"] - , [["./", "user-errors", "TESTS"], "user-errors"] - , [["./", "built-in-rules", "TESTS"], "built-in-rules"] - , [["./", "build-fails", "TESTS"], "build-fails"] - , [["./", "remote-execution", "TESTS"], "remote-execution"] - , [["./", "target-cache", "TESTS"], "target-cache"] - , [["./", "just-mr", "TESTS"], "just-mr"] - , [["./", "git-import", "TESTS"], "git-import"] - , [["./", "gc", "TESTS"], "gc"] - , [["./", "execution-service", "TESTS"], "execution-service"] - , [["./", "symlinks", "TESTS"], "symlinks"] + [ [ ["./", "actions", "TESTS"] + , ["./", "cli", "TESTS"] + , ["./", "generated-binary", "TESTS"] + , ["./", "target-tests", "TESTS"] + , ["./", "user-errors", "TESTS"] + , ["./", "built-in-rules", "TESTS"] + , ["./", "build-fails", "TESTS"] + , ["./", "remote-execution", "TESTS"] + , ["./", "target-cache", "TESTS"] + , ["./", "just-mr", "TESTS"] + , ["./", "git-import", "TESTS"] + , ["./", "gc", "TESTS"] + , ["./", "execution-service", "TESTS"] + , ["./", "symlinks", "TESTS"] ] , { "type": "if" , "cond": {"type": "var", "name": "TEST_BOOTSTRAP_JUST_MR"} , "then": [] - , "else": [[["./", "serve-service", "TESTS"], "serve-service"]] + , "else": [["./", "serve-service", "TESTS"]] } ] } diff --git a/test/end-to-end/actions/TARGETS b/test/end-to-end/actions/TARGETS index a8dbd279..b0afae2c 100644 --- a/test/end-to-end/actions/TARGETS +++ b/test/end-to-end/actions/TARGETS @@ -91,9 +91,9 @@ , "deps": [["", "tool-under-test"]] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] , "arguments_config": ["DROP_IO_HEAVY_TESTS"] + , "stage": ["actions"] , "deps": { "type": "++" , "$1": diff --git a/test/end-to-end/build-fails/TARGETS b/test/end-to-end/build-fails/TARGETS index 6aa6ada1..966299b5 100644 --- a/test/end-to-end/build-fails/TARGETS +++ b/test/end-to-end/build-fails/TARGETS @@ -5,5 +5,8 @@ , "deps": [["", "tool-under-test"]] } , "TESTS": - {"type": "install", "tainted": ["test"], "deps": ["single_fail_dep"]} + { "type": ["@", "rules", "test", "suite"] + , "stage": ["build-fails"] + , "deps": ["single_fail_dep"] + } } diff --git a/test/end-to-end/built-in-rules/TARGETS b/test/end-to-end/built-in-rules/TARGETS index 47a2a811..8708a379 100644 --- a/test/end-to-end/built-in-rules/TARGETS +++ b/test/end-to-end/built-in-rules/TARGETS @@ -36,8 +36,8 @@ , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["built-in-rules"] , "deps": [ "generic_out_dirs" , "generic_sh" diff --git a/test/end-to-end/cli/TARGETS b/test/end-to-end/cli/TARGETS index f7237f28..20082fd7 100644 --- a/test/end-to-end/cli/TARGETS +++ b/test/end-to-end/cli/TARGETS @@ -67,9 +67,9 @@ , "deps": [["", "tool-under-test"]] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] , "arguments_config": ["TEST_BOOTSTRAP_JUST_MR"] + , "stage": ["cli"] , "deps": { "type": "++" , "$1": diff --git a/test/end-to-end/execution-service/TARGETS b/test/end-to-end/execution-service/TARGETS index 76b8b37c..6eb708b7 100644 --- a/test/end-to-end/execution-service/TARGETS +++ b/test/end-to-end/execution-service/TARGETS @@ -11,8 +11,8 @@ , "deps": [["", "tool-under-test"]] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["execution-service"] , "deps": ["simple_build", "tree_inputs"] } } diff --git a/test/end-to-end/gc/TARGETS b/test/end-to-end/gc/TARGETS index 0d392d50..5d3cb38b 100644 --- a/test/end-to-end/gc/TARGETS +++ b/test/end-to-end/gc/TARGETS @@ -29,8 +29,8 @@ , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["gc"] , "deps": [ "basic" , "compactification" diff --git a/test/end-to-end/generated-binary/TARGETS b/test/end-to-end/generated-binary/TARGETS index fa5aa9bc..ef876c37 100644 --- a/test/end-to-end/generated-binary/TARGETS +++ b/test/end-to-end/generated-binary/TARGETS @@ -15,5 +15,8 @@ , "deps": [["", "tool-under-test"], "compile rules"] } , "TESTS": - {"type": "install", "tainted": ["test"], "deps": ["shell", "compiled"]} + { "type": ["@", "rules", "test", "suite"] + , "stage": ["generated-binary"] + , "deps": ["shell", "compiled"] + } } diff --git a/test/end-to-end/git-import/TARGETS b/test/end-to-end/git-import/TARGETS index d932908f..6ffe15df 100644 --- a/test/end-to-end/git-import/TARGETS +++ b/test/end-to-end/git-import/TARGETS @@ -49,9 +49,9 @@ , "keep": ["repos.json", "deduplicated.json"] } , "TESTS": - { "type": "install" + { "type": ["@", "rules", "test", "suite"] , "arguments_config": ["TEST_BOOTSTRAP_JUST_MR"] - , "tainted": ["test"] + , "stage": ["git-import"] , "deps": { "type": "++" , "$1": diff --git a/test/end-to-end/just-mr/TARGETS b/test/end-to-end/just-mr/TARGETS index 66aabf45..872d154b 100644 --- a/test/end-to-end/just-mr/TARGETS +++ b/test/end-to-end/just-mr/TARGETS @@ -214,9 +214,9 @@ , "keep": ["log/log-1", "log/log-2"] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] , "arguments_config": ["TEST_BOOTSTRAP_JUST_MR", "TEST_COMPATIBLE_REMOTE"] + , "stage": ["just-mr"] , "deps": { "type": "++" , "$1": diff --git a/test/end-to-end/remote-execution/TARGETS b/test/end-to-end/remote-execution/TARGETS index 85fb6f8d..8ab1259e 100644 --- a/test/end-to-end/remote-execution/TARGETS +++ b/test/end-to-end/remote-execution/TARGETS @@ -73,8 +73,8 @@ , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["remote-execution"] , "arguments_config": ["TEST_COMPATIBLE_REMOTE", "TEST_BOOTSTRAP_JUST_MR", "DROP_IO_HEAVY_TESTS"] , "deps": diff --git a/test/end-to-end/serve-service/TARGETS b/test/end-to-end/serve-service/TARGETS index 46e9e0dc..23c0525a 100644 --- a/test/end-to-end/serve-service/TARGETS +++ b/test/end-to-end/serve-service/TARGETS @@ -172,9 +172,15 @@ , "repos": ["serve-many-targets (data)"] } , "TESTS (unconfigured)": - { "type": "install" - , "tainted": ["test"] - , "arguments_config": ["TEST_COMPATIBLE_REMOTE"] + { "type": ["@", "rules", "test", "suite"] + , "arguments_config": ["TEST_COMPATIBLE_REMOTE", "TEST_STANDALONE_SERVE"] + , "stage": + [ { "type": "if" + , "cond": {"type": "var", "name": "TEST_STANDALONE_SERVE"} + , "then": "standalone-serve" + , "else": "separate-remote" + } + ] , "deps": { "type": "++" , "$1": @@ -196,15 +202,14 @@ , "then": [] , "else": ["serve-tree"] } + , [ ["./", "serve-archive-root", "TESTS"] + , ["./", "serve-git-root", "TESTS"] + , ["./", "serve-file-root", "TESTS"] + , ["./", "serve-git-tree-root", "TESTS"] + , ["./", "serve-distdir-root", "TESTS"] + ] ] } - , "dirs": - [ [["./", "serve-archive-root", "TESTS"], "serve-archive-root"] - , [["./", "serve-git-root", "TESTS"], "serve-git-root"] - , [["./", "serve-file-root", "TESTS"], "serve-file-root"] - , [["./", "serve-git-tree-root", "TESTS"], "serve-git-tree-root"] - , [["./", "serve-distdir-root", "TESTS"], "serve-distdir-root"] - ] } , "TESTS (separate remote)": { "type": "configure" @@ -221,11 +226,8 @@ {"type": "singleton_map", "key": "TEST_STANDALONE_SERVE", "value": true} } , "TESTS": - { "type": "install" - , "tainted": ["test"] - , "dirs": - [ ["TESTS (separate remote)", "separate-remote"] - , ["TESTS (standalone serve)", "standalone-serve"] - ] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["serve-service"] + , "deps": ["TESTS (separate remote)", "TESTS (standalone serve)"] } } 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 a133956b..af54b68b 100644 --- a/test/end-to-end/serve-service/serve-archive-root/TARGETS +++ b/test/end-to-end/serve-service/serve-archive-root/TARGETS @@ -99,8 +99,8 @@ ] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["serve-archive-root"] , "deps": [ "unresolved-present" , "unresolved-absent" 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 8cff743a..156806d8 100644 --- a/test/end-to-end/serve-service/serve-distdir-root/TARGETS +++ b/test/end-to-end/serve-service/serve-distdir-root/TARGETS @@ -55,9 +55,8 @@ , "repos": [["TREE", null, "foreign-file-data"]] } , "TESTS": - { "type": "install" - , "arguments_config": ["TEST_COMPATIBLE_REMOTE"] - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["serve-distdir-root"] , "deps": ["present", "absent", "upload", "foreign-file"] } } 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 1c51a3e7..60753726 100644 --- a/test/end-to-end/serve-service/serve-file-root/TARGETS +++ b/test/end-to-end/serve-service/serve-file-root/TARGETS @@ -8,5 +8,9 @@ , ["end-to-end/serve-service", "serve-tree (archive)"] ] } -, "TESTS": {"type": "install", "tainted": ["test"], "deps": ["upload"]} +, "TESTS": + { "type": ["@", "rules", "test", "suite"] + , "stage": ["serve-file-root"] + , "deps": ["upload"] + } } 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 d8d6b9db..29ccee00 100644 --- a/test/end-to-end/serve-service/serve-git-root/TARGETS +++ b/test/end-to-end/serve-service/serve-git-root/TARGETS @@ -23,8 +23,8 @@ ] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["serve-git-root"] , "deps": ["present", "absent", "absent-upload"] } } 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 143aa7a4..ffcd5bd4 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 @@ -13,5 +13,8 @@ , "repos": [["end-to-end/serve-service", "serve-tree (data)"]] } , "TESTS": - {"type": "install", "tainted": ["test"], "deps": ["present", "absent"]} + { "type": ["@", "rules", "test", "suite"] + , "stage": ["serve-git-tree-root"] + , "deps": ["present", "absent"] + } } diff --git a/test/end-to-end/symlinks/TARGETS b/test/end-to-end/symlinks/TARGETS index f70f2029..9394c5ee 100644 --- a/test/end-to-end/symlinks/TARGETS +++ b/test/end-to-end/symlinks/TARGETS @@ -4,5 +4,9 @@ , "test": ["stage-links.sh"] , "deps": [["", "tool-under-test"]] } -, "TESTS": {"type": "install", "tainted": ["test"], "deps": ["stage-links"]} +, "TESTS": + { "type": ["@", "rules", "test", "suite"] + , "stage": ["symlinks"] + , "deps": ["stage-links"] + } } diff --git a/test/end-to-end/target-cache/TARGETS b/test/end-to-end/target-cache/TARGETS index 10cb27ee..75c0d385 100644 --- a/test/end-to-end/target-cache/TARGETS +++ b/test/end-to-end/target-cache/TARGETS @@ -43,8 +43,8 @@ , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["target-cache"] , "arguments_config": ["TEST_BOOTSTRAP_JUST_MR"] , "deps": { "type": "++" diff --git a/test/end-to-end/target-tests/TARGETS b/test/end-to-end/target-tests/TARGETS index b4a9b210..f49d6202 100644 --- a/test/end-to-end/target-tests/TARGETS +++ b/test/end-to-end/target-tests/TARGETS @@ -41,8 +41,8 @@ , "deps": [["", "tool-under-test"]] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["target-tests"] , "deps": [ "upwards reference" , "repository naming" diff --git a/test/end-to-end/user-errors/TARGETS b/test/end-to-end/user-errors/TARGETS index e52e7c5a..5aaffde0 100644 --- a/test/end-to-end/user-errors/TARGETS +++ b/test/end-to-end/user-errors/TARGETS @@ -11,8 +11,8 @@ , "deps": [["", "tool-under-test"]] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["user-errors"] , "deps": ["flat-stage", "json-errors"] } } diff --git a/test/other_tools/TARGETS b/test/other_tools/TARGETS index adaf51e0..5b92abf7 100644 --- a/test/other_tools/TARGETS +++ b/test/other_tools/TARGETS @@ -1,10 +1,10 @@ { "TESTS": - { "type": "install" - , "tainted": ["test"] - , "dirs": - [ [["./", "git_operations", "TESTS"], "git_operations"] - , [["./", "utils", "TESTS"], "utils"] - , [["./", "just_mr", "TESTS"], "just_mr"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["other_tools"] + , "deps": + [ ["./", "git_operations", "TESTS"] + , ["./", "utils", "TESTS"] + , ["./", "just_mr", "TESTS"] ] } } diff --git a/test/other_tools/git_operations/TARGETS b/test/other_tools/git_operations/TARGETS index 1fe6b492..381b97c9 100644 --- a/test/other_tools/git_operations/TARGETS +++ b/test/other_tools/git_operations/TARGETS @@ -74,8 +74,8 @@ , "deps": ["git_config_run"] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["git_operations"] , "deps": [ "critical_git_ops_mp" , "git_repo_remote" diff --git a/test/other_tools/just_mr/TARGETS b/test/other_tools/just_mr/TARGETS index fd545232..d2397e7f 100644 --- a/test/other_tools/just_mr/TARGETS +++ b/test/other_tools/just_mr/TARGETS @@ -22,5 +22,8 @@ , "stage": ["test", "other_tools", "just_mr"] } , "TESTS": - {"type": "install", "tainted": ["test"], "deps": ["rc_merge", "mirrors"]} + { "type": ["@", "rules", "test", "suite"] + , "stage": ["just_mr"] + , "deps": ["rc_merge", "mirrors"] + } } diff --git a/test/other_tools/utils/TARGETS b/test/other_tools/utils/TARGETS index b43788f1..6506de8f 100644 --- a/test/other_tools/utils/TARGETS +++ b/test/other_tools/utils/TARGETS @@ -30,5 +30,8 @@ , "stage": ["test", "other_tools", "utils"] } , "TESTS": - {"type": "install", "tainted": ["test"], "deps": ["curl_usage", "curl_url"]} + { "type": ["@", "rules", "test", "suite"] + , "stage": ["utils"] + , "deps": ["curl_usage", "curl_url"] + } } diff --git a/test/utils/TARGETS b/test/utils/TARGETS index 8a8aea6c..619e4134 100644 --- a/test/utils/TARGETS +++ b/test/utils/TARGETS @@ -183,9 +183,8 @@ ] } , "TESTS": - { "type": "install" - , "tainted": ["test"] - , "dirs": - [[["./", "cpp", "TESTS"], "cpp"], [["./", "archive", "TESTS"], "archive"]] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["utils"] + , "deps": [["./", "cpp", "TESTS"], ["./", "archive", "TESTS"]] } } diff --git a/test/utils/archive/TARGETS b/test/utils/archive/TARGETS index 15b849c5..a1aa02c9 100644 --- a/test/utils/archive/TARGETS +++ b/test/utils/archive/TARGETS @@ -11,5 +11,9 @@ ] , "stage": ["test", "utils", "archive"] } -, "TESTS": {"type": "install", "tainted": ["test"], "deps": ["archive_usage"]} +, "TESTS": + { "type": ["@", "rules", "test", "suite"] + , "stage": ["archive"] + , "deps": ["archive_usage"] + } } diff --git a/test/utils/cpp/TARGETS b/test/utils/cpp/TARGETS index 1678fdda..c7a7e4f8 100644 --- a/test/utils/cpp/TARGETS +++ b/test/utils/cpp/TARGETS @@ -46,8 +46,8 @@ , "stage": ["test", "utils", "cpp"] } , "TESTS": - { "type": "install" - , "tainted": ["test"] + { "type": ["@", "rules", "test", "suite"] + , "stage": ["cpp"] , "deps": ["path", "path_rebase", "file_locking", "prefix"] } } |