diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-09-23 13:06:54 +0200 |
|---|---|---|
| committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-09-23 13:06:54 +0200 |
| commit | 1f99796d6f808f006dff6dc6576910bef493e244 (patch) | |
| tree | 92ff88b497fed6a6d69ebc90dc88f3db3c940b8e /test | |
| parent | dc1db0e8b43f5e907a3ded2e39da8b58fa50a04b (diff) | |
| download | justbuild-1f99796d6f808f006dff6dc6576910bef493e244.tar.gz | |
Reorder dependencies and remove duplicates in OSS
Diffstat (limited to 'test')
46 files changed, 343 insertions, 344 deletions
diff --git a/test/TARGETS b/test/TARGETS index 30878fb0..3b660295 100644 --- a/test/TARGETS +++ b/test/TARGETS @@ -37,10 +37,10 @@ , "srcs": ["main.cpp"] , "deps": [ ["@", "catch2", "", "catch2"] - , ["utils", "log_config"] , ["@", "src", "src/buildtool/file_system", "git_context"] , ["@", "src", "src/buildtool/storage", "config"] , ["@", "src", "src/buildtool/storage", "file_chunker"] + , ["utils", "log_config"] , ["utils", "test_env"] ] , "stage": ["test"] diff --git a/test/bootstrap/TARGETS b/test/bootstrap/TARGETS index 2739c40a..288ed52d 100644 --- a/test/bootstrap/TARGETS +++ b/test/bootstrap/TARGETS @@ -7,9 +7,9 @@ ] , "test": ["test-bootstrap.sh"] , "deps": - [ ["@", "src", "", "bootstrap-src"] + [ "prune-config.py" , ["@", "just-distfiles", "", "distdir"] - , "prune-config.py" + , ["@", "src", "", "bootstrap-src"] ] } , "bundled-test-debug": @@ -107,8 +107,8 @@ [ "bundled-test" , "bundled-test-debug" , "bundled-test-gnu" - , "pkgconfig-test" , "mixed-test" + , "pkgconfig-test" , "symlink-test" ] } diff --git a/test/buildtool/build_engine/base_maps/TARGETS b/test/buildtool/build_engine/base_maps/TARGETS index 97871ad2..faecc784 100644 --- a/test/buildtool/build_engine/base_maps/TARGETS +++ b/test/buildtool/build_engine/base_maps/TARGETS @@ -15,8 +15,8 @@ , "srcs": ["entity_name.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name"] + , ["", "catch-main"] ] , "stage": ["test", "buildtool", "build_engine", "base_maps"] } @@ -28,11 +28,11 @@ , "private-deps": [ "test_repo" , ["@", "catch2", "", "catch2"] - , ["", "catch-main"] - , ["@", "src", "src/buildtool/common", "config"] , ["@", "src", "src/buildtool/build_engine/base_maps", "directory_map"] , ["@", "src", "src/buildtool/build_engine/base_maps", "module_name"] + , ["@", "src", "src/buildtool/common", "config"] , ["@", "src", "src/buildtool/file_system", "file_root"] + , ["", "catch-main"] ] , "stage": ["test", "buildtool", "build_engine", "base_maps"] } @@ -44,11 +44,11 @@ , "private-deps": [ "test_repo" , ["@", "catch2", "", "catch2"] - , ["", "catch-main"] - , ["@", "src", "src/buildtool/common", "config"] , ["@", "src", "src/buildtool/build_engine/base_maps", "json_file_map"] + , ["@", "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"] } @@ -60,15 +60,15 @@ , "private-deps": [ "test_repo" , ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "json", "", "json"] - , ["@", "src", "src/buildtool/common", "config"] - , ["@", "src", "src/buildtool/common", "protocol_traits"] , ["@", "src", "src/buildtool/build_engine/base_maps", "directory_map"] - , ["@", "src", "src/buildtool/build_engine/base_maps", "source_map"] , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name_data"] - , ["@", "src", "src/buildtool/file_system", "file_root"] + , ["@", "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"] + , ["", "catch-main"] , ["utils", "test_hash_function_type"] ] , "stage": ["test", "buildtool", "build_engine", "base_maps"] @@ -81,14 +81,14 @@ , "private-deps": [ "test_repo" , ["@", "catch2", "", "catch2"] - , ["", "catch-main"] - , ["@", "src", "src/buildtool/build_engine/base_maps", "expression_map"] , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name_data"] + , ["@", "src", "src/buildtool/build_engine/base_maps", "expression_map"] , ["@", "src", "src/buildtool/build_engine/base_maps", "json_file_map"] , ["@", "src", "src/buildtool/build_engine/expression", "expression"] , ["@", "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"] } @@ -100,16 +100,15 @@ , "private-deps": [ "test_repo" , ["@", "catch2", "", "catch2"] - , ["", "catch-main"] - , ["@", "src", "src/buildtool/common", "config"] - , ["@", "src", "src/buildtool/build_engine/base_maps", "rule_map"] , ["@", "src", "src/buildtool/build_engine/base_maps", "entity_name_data"] , ["@", "src", "src/buildtool/build_engine/base_maps", "expression_map"] , ["@", "src", "src/buildtool/build_engine/base_maps", "json_file_map"] + , ["@", "src", "src/buildtool/build_engine/base_maps", "rule_map"] , ["@", "src", "src/buildtool/build_engine/expression", "expression"] , ["@", "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"] } diff --git a/test/buildtool/build_engine/expression/TARGETS b/test/buildtool/build_engine/expression/TARGETS index 9284aba3..01f7e610 100644 --- a/test/buildtool/build_engine/expression/TARGETS +++ b/test/buildtool/build_engine/expression/TARGETS @@ -4,9 +4,9 @@ , "srcs": ["linked_map.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] + , ["@", "src", "src/buildtool/build_engine/expression", "linked_map"] , ["", "catch-main"] , ["utils", "container_matchers"] - , ["@", "src", "src/buildtool/build_engine/expression", "linked_map"] ] , "stage": ["test", "buildtool", "build_engine", "expression"] } @@ -16,10 +16,10 @@ , "srcs": ["expression.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] - , ["utils", "container_matchers"] , ["@", "src", "src/buildtool/build_engine/expression", "expression"] , ["@", "src", "src/buildtool/common", "common"] + , ["", "catch-main"] + , ["utils", "container_matchers"] ] , "stage": ["test", "buildtool", "build_engine", "expression"] } @@ -29,9 +29,9 @@ , "srcs": ["configuration.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] + , ["@", "src", "src/buildtool/build_engine/expression", "expression"] , ["", "catch-main"] , ["utils", "container_matchers"] - , ["@", "src", "src/buildtool/build_engine/expression", "expression"] ] , "stage": ["test", "buildtool", "build_engine", "expression"] } diff --git a/test/buildtool/build_engine/target_map/TARGETS b/test/buildtool/build_engine/target_map/TARGETS index 6db3919e..f1de7752 100644 --- a/test/buildtool/build_engine/target_map/TARGETS +++ b/test/buildtool/build_engine/target_map/TARGETS @@ -4,15 +4,15 @@ , "srcs": ["result_map.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "json", "", "json"] - , ["@", "src", "src/buildtool/build_engine/expression", "expression"] - , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/build_engine/analysed_target", "target"] + , ["@", "src", "src/buildtool/build_engine/expression", "expression"] , ["@", "src", "src/buildtool/build_engine/target_map", "result_map"] - , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/common", "action_description"] + , ["@", "src", "src/buildtool/common", "common"] + , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/progress_reporting", "progress"] + , ["", "catch-main"] ] , "stage": ["test", "buildtool", "build_engine", "target_map"] } @@ -23,7 +23,6 @@ , "data": ["test_data"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "src", "src/buildtool/auth", "auth"] , ["@", "src", "src/buildtool/build_engine/base_maps", "directory_map"] , ["@", "src", "src/buildtool/build_engine/base_maps", "rule_map"] @@ -31,22 +30,23 @@ , ["@", "src", "src/buildtool/build_engine/base_maps", "targets_file_map"] , ["@", "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/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/progress_reporting", "progress"] - , ["@", "src", "src/buildtool/storage", "config"] - , ["@", "src", "src/buildtool/storage", "storage"] , ["@", "src", "src/buildtool/main", "analyse_context"] - , ["@", "src", "src/buildtool/common", "config"] + , ["@", "src", "src/buildtool/progress_reporting", "progress"] , ["@", "src", "src/buildtool/serve_api/remote", "config"] , ["@", "src", "src/buildtool/serve_api/remote", "serve_api"] - , ["@", "src", "src/buildtool/crypto", "hash_function"] - , ["utils", "test_storage_config"] + , ["@", "src", "src/buildtool/storage", "config"] + , ["@", "src", "src/buildtool/storage", "storage"] + , ["", "catch-main"] , ["utils", "test_serve_config"] + , ["utils", "test_storage_config"] ] , "stage": ["test", "buildtool", "build_engine", "target_map"] } @@ -56,13 +56,13 @@ , "srcs": ["target_map_internals.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] + , ["@", "src", "src/buildtool/build_engine/expression", "expression"] , [ "@" , "src" , "src/buildtool/build_engine/target_map" , "target_map_testable_internals" ] - , ["@", "src", "src/buildtool/build_engine/expression", "expression"] + , ["", "catch-main"] ] , "stage": ["test", "buildtool", "build_engine", "target_map"] } diff --git a/test/buildtool/build_engine/target_map/data_targets/simple_targets/TARGETS b/test/buildtool/build_engine/target_map/data_targets/simple_targets/TARGETS index 9eace0f2..52be68c0 100644 --- a/test/buildtool/build_engine/target_map/data_targets/simple_targets/TARGETS +++ b/test/buildtool/build_engine/target_map/data_targets/simple_targets/TARGETS @@ -7,11 +7,11 @@ } , "collect dep artifacts": { "type": ["simple_rules", "collect deps"] - , "deps": ["foo.txt", "bar.txt", "baz.txt", "link"] + , "deps": ["bar.txt", "baz.txt", "foo.txt", "link"] } , "collect as runfiles": { "type": ["simple_rules", "collect deps as runfiles"] - , "deps": ["foo.txt", "bar.txt", "baz.txt", "link"] + , "deps": ["bar.txt", "baz.txt", "foo.txt", "link"] } , "stage blob": { "type": ["simple_rules", "text file"] @@ -72,7 +72,7 @@ } , "install": { "type": "install" - , "deps": ["foo.txt", "bar.txt", "link"] + , "deps": ["bar.txt", "foo.txt", "link"] , "files": { "link_gen": "use generic sym" , "combined.txt": "use generic" diff --git a/test/buildtool/common/TARGETS b/test/buildtool/common/TARGETS index 020d0f28..bec2d031 100644 --- a/test/buildtool/common/TARGETS +++ b/test/buildtool/common/TARGETS @@ -4,13 +4,13 @@ , "srcs": ["artifact_description.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "json", "", "json"] , ["@", "src", "src/buildtool/common", "artifact_description"] - , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/common", "artifact_digest_factory"] + , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["@", "src", "src/buildtool/file_system", "object_type"] + , ["", "catch-main"] , ["utils", "test_hash_function_type"] ] , "stage": ["test", "buildtool", "common"] @@ -21,11 +21,11 @@ , "srcs": ["action_description.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "json", "", "json"] , ["@", "src", "src/buildtool/common", "action_description"] , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/crypto", "hash_function"] + , ["", "catch-main"] , ["utils", "test_hash_function_type"] ] , "stage": ["test", "buildtool", "common"] @@ -36,16 +36,16 @@ , "srcs": ["repository_config.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "json", "", "json"] - , ["@", "src", "src/buildtool/common", "config"] , ["@", "src", "src/buildtool/common", "common"] + , ["@", "src", "src/buildtool/common", "config"] + , ["@", "src", "src/buildtool/execution_api/local", "local"] , ["@", "src", "src/buildtool/file_system", "file_root"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] - , ["utils", "test_storage_config"] - , ["@", "src", "src/buildtool/execution_api/local", "local"] - , ["@", "src", "src/buildtool/storage", "storage"] , ["@", "src", "src/buildtool/storage", "config"] + , ["@", "src", "src/buildtool/storage", "storage"] + , ["", "catch-main"] + , ["utils", "test_storage_config"] ] , "stage": ["test", "buildtool", "common"] } diff --git a/test/buildtool/crypto/TARGETS b/test/buildtool/crypto/TARGETS index 43617dae..40971816 100644 --- a/test/buildtool/crypto/TARGETS +++ b/test/buildtool/crypto/TARGETS @@ -4,8 +4,8 @@ , "srcs": ["hasher.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "src", "src/buildtool/crypto", "hasher"] + , ["", "catch-main"] ] , "stage": ["test", "buildtool", "crypto"] } @@ -15,8 +15,8 @@ , "srcs": ["hash_function.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "src", "src/buildtool/crypto", "hash_function"] + , ["", "catch-main"] ] , "stage": ["test", "buildtool", "crypto"] } @@ -26,15 +26,15 @@ , "srcs": ["hash_info.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] - , ["@", "src", "src/buildtool/crypto", "hash_info"] , ["@", "src", "src/buildtool/crypto", "hash_function"] + , ["@", "src", "src/buildtool/crypto", "hash_info"] + , ["", "catch-main"] ] , "stage": ["test", "buildtool", "crypto"] } , "TESTS": { "type": ["@", "rules", "test", "suite"] , "stage": ["crypto"] - , "deps": ["hasher", "hash_function", "hash_info"] + , "deps": ["hash_function", "hash_info", "hasher"] } } diff --git a/test/buildtool/execution_api/TARGETS b/test/buildtool/execution_api/TARGETS index 8582cdbd..13076988 100644 --- a/test/buildtool/execution_api/TARGETS +++ b/test/buildtool/execution_api/TARGETS @@ -12,10 +12,10 @@ { "type": ["@", "rules", "test", "suite"] , "stage": ["execution_api"] , "deps": - [ ["./", "common", "TESTS"] - , ["./", "bazel", "TESTS"] - , ["./", "local", "TESTS"] + [ ["./", "bazel", "TESTS"] + , ["./", "common", "TESTS"] , ["./", "execution_service", "TESTS"] + , ["./", "local", "TESTS"] ] } } diff --git a/test/buildtool/execution_api/bazel/TARGETS b/test/buildtool/execution_api/bazel/TARGETS index 9d86bd55..883fc1a6 100644 --- a/test/buildtool/execution_api/bazel/TARGETS +++ b/test/buildtool/execution_api/bazel/TARGETS @@ -5,17 +5,17 @@ , "private-deps": [ ["@", "catch2", "", "catch2"] , ["@", "gsl", "", "gsl"] - , ["utils", "catch-main-remote-execution"] - , ["utils", "test_auth_config"] - , ["utils", "test_remote_config"] , ["@", "src", "src/buildtool/common", "bazel_digest_factory"] , ["@", "src", "src/buildtool/common/remote", "retry_config"] + , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["@", "src", "src/buildtool/execution_api/bazel_msg", "bazel_msg"] , ["@", "src", "src/buildtool/execution_api/remote", "bazel_network"] , ["@", "src", "src/buildtool/execution_api/remote", "config"] , ["@", "src", "src/buildtool/file_system", "object_type"] - , ["@", "src", "src/buildtool/crypto", "hash_function"] + , ["utils", "catch-main-remote-execution"] + , ["utils", "test_auth_config"] , ["utils", "test_hash_function_type"] + , ["utils", "test_remote_config"] ] , "stage": ["test", "buildtool", "execution_api", "bazel"] } @@ -25,17 +25,17 @@ , "srcs": ["bazel_execution_client.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["utils", "catch-main-remote-execution"] - , ["utils", "execution_bazel"] - , ["utils", "test_auth_config"] - , ["utils", "test_remote_config"] , ["@", "src", "src/buildtool/common", "bazel_digest_factory"] , ["@", "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"] , ["@", "src", "src/buildtool/file_system", "object_type"] - , ["@", "src", "src/buildtool/crypto", "hash_function"] + , ["utils", "catch-main-remote-execution"] + , ["utils", "execution_bazel"] + , ["utils", "test_auth_config"] , ["utils", "test_hash_function_type"] + , ["utils", "test_remote_config"] ] , "stage": ["test", "buildtool", "execution_api", "bazel"] } @@ -45,17 +45,17 @@ , "srcs": ["bytestream_client.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["utils", "catch-main-remote-execution"] - , ["utils", "execution_bazel"] - , ["utils", "test_auth_config"] - , ["utils", "test_remote_config"] , ["@", "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/remote", "bazel_network"] , ["@", "src", "src/buildtool/execution_api/remote", "config"] , ["@", "src", "src/buildtool/file_system", "object_type"] - , ["@", "src", "src/buildtool/crypto", "hash_function"] + , ["utils", "catch-main-remote-execution"] + , ["utils", "execution_bazel"] + , ["utils", "test_auth_config"] , ["utils", "test_hash_function_type"] + , ["utils", "test_remote_config"] ] , "stage": ["test", "buildtool", "execution_api", "bazel"] } @@ -65,19 +65,19 @@ , "srcs": ["bazel_network.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["utils", "catch-main-remote-execution"] - , ["utils", "execution_bazel"] - , ["utils", "test_auth_config"] - , ["utils", "test_remote_config"] , ["@", "src", "src/buildtool/common", "bazel_digest_factory"] , ["@", "src", "src/buildtool/common", "protocol_traits"] , ["@", "src", "src/buildtool/common/remote", "retry_config"] + , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["@", "src", "src/buildtool/execution_api/bazel_msg", "bazel_msg"] , ["@", "src", "src/buildtool/execution_api/remote", "bazel_network"] , ["@", "src", "src/buildtool/execution_api/remote", "config"] , ["@", "src", "src/buildtool/file_system", "object_type"] - , ["@", "src", "src/buildtool/crypto", "hash_function"] + , ["utils", "catch-main-remote-execution"] + , ["utils", "execution_bazel"] + , ["utils", "test_auth_config"] , ["utils", "test_hash_function_type"] + , ["utils", "test_remote_config"] ] , "stage": ["test", "buildtool", "execution_api", "bazel"] } @@ -88,25 +88,25 @@ , "data": [["buildtool/storage", "test_data"]] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "src", "src/buildtool/common", "artifact_description"] + , ["@", "src", "src/buildtool/common", "artifact_digest_factory"] + , ["@", "src", "src/buildtool/common", "common"] + , ["@", "src", "src/buildtool/crypto", "hash_function"] , [ "@" , "src" , "src/buildtool/execution_api/bazel_msg" , "bazel_msg_factory" ] - , ["@", "src", "src/buildtool/file_system", "object_type"] - , ["@", "src", "src/buildtool/common", "common"] - , ["@", "src", "src/buildtool/common", "artifact_digest_factory"] - , ["@", "src", "src/buildtool/crypto", "hash_function"] - , ["utils", "test_hash_function_type"] - , ["@", "src", "src/buildtool/execution_api/common", "common"] , [ "@" , "src" , "src/buildtool/execution_api/common" , "artifact_blob_container" ] + , ["@", "src", "src/buildtool/execution_api/common", "common"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] + , ["@", "src", "src/buildtool/file_system", "object_type"] + , ["", "catch-main"] + , ["utils", "test_hash_function_type"] ] , "stage": ["test", "buildtool", "execution_api", "bazel"] } @@ -116,14 +116,14 @@ , "srcs": ["bazel_api.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["utils", "catch-main-remote-execution"] - , ["utils", "test_auth_config"] - , ["utils", "test_remote_config"] , ["@", "src", "src/buildtool/common/remote", "retry_config"] + , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["@", "src", "src/buildtool/execution_api/remote", "bazel"] , ["buildtool/execution_api/common", "api_test"] - , ["@", "src", "src/buildtool/crypto", "hash_function"] + , ["utils", "catch-main-remote-execution"] + , ["utils", "test_auth_config"] , ["utils", "test_hash_function_type"] + , ["utils", "test_remote_config"] ] , "stage": ["test", "buildtool", "execution_api", "bazel"] } @@ -131,12 +131,12 @@ { "type": ["@", "rules", "test", "suite"] , "stage": ["bazel"] , "deps": - [ "bytestream_client" + [ "bazel_api" + , "bytestream_client" , "cas_client" , "execution_client" , "msg_factory" , "network" - , "bazel_api" ] } } diff --git a/test/buildtool/execution_api/common/TARGETS b/test/buildtool/execution_api/common/TARGETS index 72c7160f..961fe269 100644 --- a/test/buildtool/execution_api/common/TARGETS +++ b/test/buildtool/execution_api/common/TARGETS @@ -6,12 +6,12 @@ [ ["@", "catch2", "", "catch2"] , ["@", "src", "src/buildtool/common", "artifact_description"] , ["@", "src", "src/buildtool/common", "artifact_digest_factory"] + , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["@", "src", "src/buildtool/execution_api/common", "common"] , ["@", "src", "src/buildtool/execution_api/local", "config"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] - , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["utils", "test_hash_function_type"] ] , "stage": ["test", "buildtool", "execution_api", "common"] @@ -22,13 +22,13 @@ , "srcs": ["bytestream_utils.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] - , ["utils", "test_hash_function_type"] - , ["@", "src", "src/buildtool/common", "bazel_types"] , ["@", "src", "src/buildtool/common", "bazel_digest_factory"] + , ["@", "src", "src/buildtool/common", "bazel_types"] , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["@", "src", "src/buildtool/execution_api/common", "bytestream_utils"] , ["@", "src", "src/buildtool/execution_api/common", "common"] + , ["", "catch-main"] + , ["utils", "test_hash_function_type"] ] , "stage": ["test", "buildtool", "execution_api", "common"] } diff --git a/test/buildtool/execution_api/execution_service/TARGETS b/test/buildtool/execution_api/execution_service/TARGETS index 2c935848..5c585c12 100644 --- a/test/buildtool/execution_api/execution_service/TARGETS +++ b/test/buildtool/execution_api/execution_service/TARGETS @@ -3,9 +3,11 @@ , "name": ["cas_server"] , "srcs": ["cas_server.test.cpp"] , "private-deps": - [ ["", "catch-main"] - , ["@", "catch2", "", "catch2"] - , ["utils", "test_storage_config"] + [ ["@", "catch2", "", "catch2"] + , ["@", "gsl", "", "gsl"] + , ["@", "src", "src/buildtool/common", "bazel_digest_factory"] + , ["@", "src", "src/buildtool/common", "common"] + , ["@", "src", "src/buildtool/common", "protocol_traits"] , [ "@" , "src" , "src/buildtool/execution_api/execution_service" @@ -15,13 +17,11 @@ , ["@", "src", "src/buildtool/execution_api/local", "context"] , ["@", "src", "src/buildtool/file_system", "git_repo"] , ["@", "src", "src/buildtool/file_system", "object_type"] - , ["@", "src", "src/buildtool/common", "common"] - , ["@", "src", "src/buildtool/common", "bazel_digest_factory"] - , ["@", "src", "src/buildtool/common", "protocol_traits"] , ["@", "src", "src/buildtool/storage", "config"] , ["@", "src", "src/buildtool/storage", "storage"] - , ["@", "gsl", "", "gsl"] + , ["", "catch-main"] , ["utils", "test_hash_function_type"] + , ["utils", "test_storage_config"] ] , "stage": ["test", "buildtool", "execution_api", "execution_service"] } diff --git a/test/buildtool/execution_api/local/TARGETS b/test/buildtool/execution_api/local/TARGETS index ec5498d8..bbf83da9 100644 --- a/test/buildtool/execution_api/local/TARGETS +++ b/test/buildtool/execution_api/local/TARGETS @@ -4,7 +4,6 @@ , "srcs": ["local_execution.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "src", "src/buildtool/common", "artifact_description"] , ["@", "src", "src/buildtool/common", "artifact_digest_factory"] , ["@", "src", "src/buildtool/common", "config"] @@ -14,9 +13,10 @@ , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] - , ["utils", "test_storage_config"] - , ["@", "src", "src/buildtool/storage", "storage"] , ["@", "src", "src/buildtool/storage", "config"] + , ["@", "src", "src/buildtool/storage", "storage"] + , ["", "catch-main"] + , ["utils", "test_storage_config"] ] , "stage": ["test", "buildtool", "execution_api", "local"] } @@ -26,14 +26,14 @@ , "srcs": ["local_api.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "src", "src/buildtool/execution_api/local", "config"] , ["@", "src", "src/buildtool/execution_api/local", "context"] , ["@", "src", "src/buildtool/execution_api/local", "local"] + , ["@", "src", "src/buildtool/storage", "config"] + , ["@", "src", "src/buildtool/storage", "storage"] + , ["", "catch-main"] , ["buildtool/execution_api/common", "api_test"] , ["utils", "test_storage_config"] - , ["@", "src", "src/buildtool/storage", "storage"] - , ["@", "src", "src/buildtool/storage", "config"] ] , "stage": ["test", "buildtool", "execution_api", "local"] } diff --git a/test/buildtool/execution_engine/dag/TARGETS b/test/buildtool/execution_engine/dag/TARGETS index 1baf9f0e..566943d5 100644 --- a/test/buildtool/execution_engine/dag/TARGETS +++ b/test/buildtool/execution_engine/dag/TARGETS @@ -4,13 +4,13 @@ , "srcs": ["dag.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "gsl", "", "gsl"] - , ["utils", "container_matchers"] , ["@", "src", "src/buildtool/common", "action_description"] , ["@", "src", "src/buildtool/common", "artifact_description"] , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/execution_engine/dag", "dag"] + , ["", "catch-main"] + , ["utils", "container_matchers"] ] , "stage": ["test", "buildtool", "execution_engine", "dag"] } diff --git a/test/buildtool/execution_engine/executor/TARGETS b/test/buildtool/execution_engine/executor/TARGETS index 343b83eb..3683a9d4 100644 --- a/test/buildtool/execution_engine/executor/TARGETS +++ b/test/buildtool/execution_engine/executor/TARGETS @@ -3,10 +3,13 @@ , "name": ["executor_api_tests"] , "hdrs": ["executor_api.test.hpp"] , "deps": - [ ["@", "src", "src/buildtool/auth", "auth"] + [ ["@", "catch2", "", "catch2"] + , ["@", "gsl", "", "gsl"] + , ["@", "src", "src/buildtool/auth", "auth"] , ["@", "src", "src/buildtool/common", "artifact_description"] - , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/common", "artifact_digest_factory"] + , ["@", "src", "src/buildtool/common", "common"] + , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["@", "src", "src/buildtool/execution_api/common", "common"] , ["@", "src", "src/buildtool/execution_api/remote", "config"] , ["@", "src", "src/buildtool/execution_api/remote", "context"] @@ -15,12 +18,9 @@ , ["@", "src", "src/buildtool/execution_engine/executor", "executor"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/progress_reporting", "progress"] - , ["@", "src", "src/buildtool/crypto", "hash_function"] - , ["@", "catch2", "", "catch2"] - , ["@", "gsl", "", "gsl"] , ["utils", "test_api_bundle"] - , ["utils", "test_remote_config"] , ["utils", "test_hash_function_type"] + , ["utils", "test_remote_config"] ] , "stage": ["test", "buildtool", "execution_engine", "executor"] } @@ -29,12 +29,15 @@ , "name": ["executor"] , "srcs": ["executor.test.cpp"] , "private-deps": - [ ["@", "src", "src/buildtool/auth", "auth"] + [ ["@", "catch2", "", "catch2"] + , ["@", "gsl", "", "gsl"] + , ["@", "src", "src/buildtool/auth", "auth"] , ["@", "src", "src/buildtool/common", "artifact_description"] - , ["@", "src", "src/buildtool/common", "common"] , ["@", "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"] , ["@", "src", "src/buildtool/execution_api/remote", "context"] @@ -42,11 +45,8 @@ , ["@", "src", "src/buildtool/execution_engine/executor", "context"] , ["@", "src", "src/buildtool/execution_engine/executor", "executor"] , ["@", "src", "src/buildtool/progress_reporting", "progress"] - , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["@", "src", "src/utils/cpp", "expected"] , ["", "catch-main"] - , ["@", "catch2", "", "catch2"] - , ["@", "gsl", "", "gsl"] , ["utils", "test_api_bundle"] , ["utils", "test_hash_function_type"] ] @@ -59,6 +59,7 @@ , "data": ["test_data"] , "private-deps": [ "executor_api_tests" + , ["@", "catch2", "", "catch2"] , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/common", "config"] , ["@", "src", "src/buildtool/execution_api/local", "config"] @@ -67,12 +68,11 @@ , ["@", "src", "src/buildtool/execution_api/remote", "config"] , ["@", "src", "src/buildtool/execution_engine/executor", "executor"] , ["@", "src", "src/buildtool/progress_reporting", "progress"] + , ["@", "src", "src/buildtool/storage", "config"] + , ["@", "src", "src/buildtool/storage", "storage"] , ["utils", "catch-main-remote-execution"] - , ["utils", "test_storage_config"] , ["utils", "test_auth_config"] - , ["@", "catch2", "", "catch2"] - , ["@", "src", "src/buildtool/storage", "storage"] - , ["@", "src", "src/buildtool/storage", "config"] + , ["utils", "test_storage_config"] ] , "stage": ["test", "buildtool", "execution_engine", "executor"] } @@ -83,19 +83,19 @@ , "data": ["test_data"] , "private-deps": [ "executor_api_tests" + , ["@", "catch2", "", "catch2"] , ["@", "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/remote", "bazel"] , ["@", "src", "src/buildtool/execution_api/remote", "config"] , ["@", "src", "src/buildtool/execution_engine/executor", "executor"] , ["@", "src", "src/buildtool/progress_reporting", "progress"] - , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["utils", "catch-main-remote-execution"] , ["utils", "test_auth_config"] - , ["utils", "test_remote_config"] - , ["@", "catch2", "", "catch2"] , ["utils", "test_hash_function_type"] + , ["utils", "test_remote_config"] ] , "stage": ["test", "buildtool", "execution_engine", "executor"] } diff --git a/test/buildtool/execution_engine/traverser/TARGETS b/test/buildtool/execution_engine/traverser/TARGETS index 72a7abea..ba159245 100644 --- a/test/buildtool/execution_engine/traverser/TARGETS +++ b/test/buildtool/execution_engine/traverser/TARGETS @@ -4,13 +4,13 @@ , "srcs": ["traverser.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] - , ["utils", "container_matchers"] - , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/common", "artifact_description"] + , ["@", "src", "src/buildtool/common", "common"] + , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["@", "src", "src/buildtool/execution_engine/dag", "dag"] , ["@", "src", "src/buildtool/execution_engine/traverser", "traverser"] - , ["@", "src", "src/buildtool/crypto", "hash_function"] + , ["", "catch-main"] + , ["utils", "container_matchers"] , ["utils", "test_hash_function_type"] ] , "stage": ["test", "buildtool", "execution_engine", "traverser"] diff --git a/test/buildtool/file_system/TARGETS b/test/buildtool/file_system/TARGETS index 8d1a5c0a..4210a13a 100644 --- a/test/buildtool/file_system/TARGETS +++ b/test/buildtool/file_system/TARGETS @@ -5,11 +5,11 @@ , "data": ["test_data"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "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"] + , ["", "catch-main"] ] , "stage": ["test", "buildtool", "file_system"] } @@ -19,13 +19,13 @@ , "srcs": ["object_cas.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] + , ["@", "src", "src/buildtool/common", "artifact_digest_factory"] + , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/file_system", "object_cas"] , ["@", "src", "src/buildtool/file_system", "object_type"] - , ["@", "src", "src/buildtool/common", "common"] - , ["@", "src", "src/buildtool/common", "artifact_digest_factory"] , ["@", "src", "src/buildtool/storage", "config"] + , ["", "catch-main"] , ["utils", "test_storage_config"] ] , "stage": ["test", "buildtool", "file_system"] @@ -37,15 +37,15 @@ , "data": ["test_data"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "fmt", "", "fmt"] - , ["utils", "container_matchers"] + , ["@", "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", "file_system_manager"] - , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/utils/cpp", "hex_string"] + , ["", "catch-main"] + , ["utils", "container_matchers"] , ["utils", "shell_quoting"] ] , "stage": ["test", "buildtool", "file_system"] @@ -57,14 +57,14 @@ , "data": ["test_data"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] - , ["utils", "container_matchers"] , ["@", "src", "src/buildtool/common", "artifact_description"] - , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/common", "artifact_digest_factory"] + , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["@", "src", "src/buildtool/file_system", "file_root"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] + , ["", "catch-main"] + , ["utils", "container_matchers"] , ["utils", "shell_quoting"] , ["utils", "test_hash_function_type"] ] @@ -77,12 +77,12 @@ , "data": ["test_data"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "fmt", "", "fmt"] - , ["utils", "container_matchers"] , ["@", "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"] @@ -117,7 +117,6 @@ , "data": ["test_data"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "fmt", "", "fmt"] , ["@", "json", "", "json"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] @@ -125,9 +124,10 @@ , ["@", "src", "src/buildtool/file_system", "git_repo"] , ["@", "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", "hex_string"] - , ["@", "src", "src/buildtool/storage", "config"] + , ["", "catch-main"] , ["utils", "shell_quoting"] , ["utils", "test_storage_config"] ] @@ -140,7 +140,6 @@ , "data": ["test_data"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "fmt", "", "fmt"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/file_system", "git_cas"] @@ -153,6 +152,7 @@ , "resolve_symlinks_map" ] , ["@", "src", "src/buildtool/multithreading", "task_system"] + , ["", "catch-main"] , ["utils", "shell_quoting"] ] , "stage": ["test", "buildtool", "file_system"] @@ -161,12 +161,12 @@ { "type": ["@", "rules", "test", "suite"] , "stage": ["file_system"] , "deps": - [ "file_root" + [ "directory_entries" + , "file_root" , "file_system_manager" - , "object_cas" - , "git_tree" - , "directory_entries" , "git_repo" + , "git_tree" + , "object_cas" , "resolve_symlinks_map" ] } diff --git a/test/buildtool/graph_traverser/TARGETS b/test/buildtool/graph_traverser/TARGETS index b2791561..7a437e9a 100644 --- a/test/buildtool/graph_traverser/TARGETS +++ b/test/buildtool/graph_traverser/TARGETS @@ -9,6 +9,7 @@ , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/common", "protocol_traits"] , ["@", "src", "src/buildtool/common/remote", "retry_config"] + , ["@", "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"] @@ -20,9 +21,8 @@ , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] , ["@", "src", "src/buildtool/progress_reporting", "progress"] - , ["@", "src", "src/buildtool/execution_api/common", "api_bundle"] - , ["@", "src", "src/buildtool/storage", "storage"] , ["@", "src", "src/buildtool/storage", "config"] + , ["@", "src", "src/buildtool/storage", "storage"] , ["utils", "test_hash_function_type"] ] , "stage": ["test", "buildtool", "graph_traverser"] @@ -35,13 +35,13 @@ , "private-deps": [ "graph_traverser_tests" , ["@", "catch2", "", "catch2"] - , ["", "catch-main"] - , ["utils", "test_auth_config"] - , ["utils", "test_storage_config"] + , ["@", "src", "src/buildtool/common", "protocol_traits"] , ["@", "src", "src/buildtool/execution_api/remote", "config"] , ["@", "src", "src/buildtool/storage", "config"] , ["@", "src", "src/buildtool/storage", "storage"] - , ["@", "src", "src/buildtool/common", "protocol_traits"] + , ["", "catch-main"] + , ["utils", "test_auth_config"] + , ["utils", "test_storage_config"] ] , "stage": ["test", "buildtool", "graph_traverser"] } @@ -53,13 +53,13 @@ , "private-deps": [ "graph_traverser_tests" , ["@", "catch2", "", "catch2"] + , ["@", "src", "src/buildtool/crypto", "hash_function"] + , ["@", "src", "src/buildtool/storage", "config"] + , ["@", "src", "src/buildtool/storage", "storage"] , ["utils", "catch-main-remote-execution"] , ["utils", "test_auth_config"] - , ["utils", "test_remote_config"] , ["utils", "test_hash_function_type"] - , ["@", "src", "src/buildtool/storage", "storage"] - , ["@", "src", "src/buildtool/storage", "config"] - , ["@", "src", "src/buildtool/crypto", "hash_function"] + , ["utils", "test_remote_config"] ] , "stage": ["test", "buildtool", "graph_traverser"] } diff --git a/test/buildtool/logging/TARGETS b/test/buildtool/logging/TARGETS index bbff8a41..2baed6b8 100644 --- a/test/buildtool/logging/TARGETS +++ b/test/buildtool/logging/TARGETS @@ -4,9 +4,9 @@ , "srcs": ["logger.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] + , ["", "catch-main"] ] , "stage": ["test", "buildtool", "logging"] } @@ -16,10 +16,10 @@ , "srcs": ["log_sink_file.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] + , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] - , ["@", "src", "src/buildtool/file_system", "file_system_manager"] + , ["", "catch-main"] ] , "stage": ["test", "buildtool", "logging"] , "private-ldflags": ["-pthread"] diff --git a/test/buildtool/main/TARGETS b/test/buildtool/main/TARGETS index 1e77cdb9..128870ba 100644 --- a/test/buildtool/main/TARGETS +++ b/test/buildtool/main/TARGETS @@ -4,10 +4,10 @@ , "srcs": ["install_cas.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "src", "src/buildtool/common", "common"] - , ["@", "src", "src/buildtool/main", "install_cas"] , ["@", "src", "src/buildtool/crypto", "hash_function"] + , ["@", "src", "src/buildtool/main", "install_cas"] + , ["", "catch-main"] ] , "stage": ["test", "buildtool", "main"] } diff --git a/test/buildtool/multithreading/TARGETS b/test/buildtool/multithreading/TARGETS index bf4e5e73..0ff7f635 100644 --- a/test/buildtool/multithreading/TARGETS +++ b/test/buildtool/multithreading/TARGETS @@ -4,8 +4,8 @@ , "srcs": ["task.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "src", "src/buildtool/multithreading", "task_system"] + , ["", "catch-main"] ] , "stage": ["test", "buildtool", "multithreading"] } @@ -15,9 +15,9 @@ , "srcs": ["task_system.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] + , ["@", "src", "src/buildtool/multithreading", "task_system"] , ["", "catch-main"] , ["utils", "container_matchers"] - , ["@", "src", "src/buildtool/multithreading", "task_system"] ] , "stage": ["test", "buildtool", "multithreading"] } @@ -27,10 +27,10 @@ , "srcs": ["async_map_node.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] - , ["utils", "container_matchers"] , ["@", "src", "src/buildtool/multithreading", "async_map_node"] , ["@", "src", "src/buildtool/multithreading", "task_system"] + , ["", "catch-main"] + , ["utils", "container_matchers"] ] , "stage": ["test", "buildtool", "multithreading"] } @@ -40,11 +40,11 @@ , "srcs": ["async_map.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] - , ["utils", "container_matchers"] , ["@", "src", "src/buildtool/multithreading", "async_map"] , ["@", "src", "src/buildtool/multithreading", "async_map_node"] , ["@", "src", "src/buildtool/multithreading", "task_system"] + , ["", "catch-main"] + , ["utils", "container_matchers"] ] , "stage": ["test", "buildtool", "multithreading"] } @@ -54,11 +54,11 @@ , "srcs": ["async_map_consumer.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] - , ["utils", "container_matchers"] - , ["@", "src", "src/buildtool/multithreading", "async_map_consumer"] , ["@", "src", "src/buildtool/multithreading", "async_map"] + , ["@", "src", "src/buildtool/multithreading", "async_map_consumer"] , ["@", "src", "src/buildtool/multithreading", "task_system"] + , ["", "catch-main"] + , ["utils", "container_matchers"] ] , "stage": ["test", "buildtool", "multithreading"] } diff --git a/test/buildtool/serve_api/TARGETS b/test/buildtool/serve_api/TARGETS index 5c5accdf..656a3ae7 100644 --- a/test/buildtool/serve_api/TARGETS +++ b/test/buildtool/serve_api/TARGETS @@ -5,14 +5,14 @@ , "data": [["buildtool/file_system", "test_data"]] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["utils", "catch-main-serve"] , ["@", "src", "src/buildtool/auth", "auth"] , ["@", "src", "src/buildtool/common/remote", "retry_config"] , ["@", "src", "src/buildtool/execution_api/remote", "config"] , ["@", "src", "src/buildtool/execution_api/remote", "context"] + , ["@", "src", "src/buildtool/serve_api/remote", "config"] , ["@", "src", "src/buildtool/serve_api/remote", "source_tree_client"] + , ["utils", "catch-main-serve"] , ["utils", "test_serve_config"] - , ["@", "src", "src/buildtool/serve_api/remote", "config"] ] , "stage": ["test", "buildtool", "serve_api"] } diff --git a/test/buildtool/storage/TARGETS b/test/buildtool/storage/TARGETS index 7b58b109..214c1fa8 100644 --- a/test/buildtool/storage/TARGETS +++ b/test/buildtool/storage/TARGETS @@ -15,15 +15,15 @@ , "data": [["buildtool/storage", "test_data"]] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] - , ["utils", "test_storage_config"] - , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/common", "artifact_digest_factory"] + , ["@", "src", "src/buildtool/common", "common"] + , ["@", "src", "src/buildtool/execution_api/bazel_msg", "bazel_msg"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/file_system", "object_type"] - , ["@", "src", "src/buildtool/execution_api/bazel_msg", "bazel_msg"] - , ["@", "src", "src/buildtool/storage", "storage"] , ["@", "src", "src/buildtool/storage", "config"] + , ["@", "src", "src/buildtool/storage", "storage"] + , ["", "catch-main"] + , ["utils", "test_storage_config"] ] , "stage": ["test", "buildtool", "storage"] } @@ -33,14 +33,14 @@ , "srcs": ["local_ac.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] + , ["@", "src", "src/buildtool/common", "artifact_digest_factory"] , ["@", "src", "src/buildtool/common", "bazel_types"] , ["@", "src", "src/buildtool/common", "common"] - , ["@", "src", "src/buildtool/common", "artifact_digest_factory"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/file_system", "object_type"] - , ["@", "src", "src/buildtool/storage", "storage"] , ["@", "src", "src/buildtool/storage", "config"] + , ["@", "src", "src/buildtool/storage", "storage"] + , ["", "catch-main"] , ["utils", "test_storage_config"] ] , "stage": ["test", "buildtool", "storage"] @@ -51,27 +51,27 @@ , "srcs": ["large_object_cas.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] - , ["@", "src", "src/buildtool/file_system", "file_system_manager"] - , ["@", "src", "src/buildtool/file_system", "object_type"] - , ["@", "src", "src/buildtool/storage", "storage"] - , ["@", "src", "src/buildtool/storage", "config"] - , ["utils", "test_storage_config"] , ["@", "src", "src/buildtool/common", "bazel_types"] , ["@", "src", "src/buildtool/common", "protocol_traits"] - , ["utils", "large_object_utils"] - , ["@", "src", "src/utils/cpp", "tmp_dir"] , [ "@" , "src" , "src/buildtool/execution_api/bazel_msg" , "bazel_msg_factory" ] + , ["@", "src", "src/buildtool/file_system", "file_system_manager"] + , ["@", "src", "src/buildtool/file_system", "object_type"] + , ["@", "src", "src/buildtool/storage", "config"] + , ["@", "src", "src/buildtool/storage", "storage"] + , ["@", "src", "src/utils/cpp", "tmp_dir"] + , ["", "catch-main"] + , ["utils", "large_object_utils"] + , ["utils", "test_storage_config"] ] , "stage": ["test", "buildtool", "storage"] } , "TESTS": { "type": ["@", "rules", "test", "suite"] , "stage": ["storage"] - , "deps": ["local_cas", "local_ac", "large_object_cas"] + , "deps": ["large_object_cas", "local_ac", "local_cas"] } } diff --git a/test/buildtool/system/TARGETS b/test/buildtool/system/TARGETS index d04bb71f..1f951b96 100644 --- a/test/buildtool/system/TARGETS +++ b/test/buildtool/system/TARGETS @@ -4,9 +4,9 @@ , "srcs": ["system_command.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/system", "system_command"] + , ["", "catch-main"] ] , "stage": ["test", "buildtool", "system"] } diff --git a/test/end-to-end/built-in-rules/TARGETS b/test/end-to-end/built-in-rules/TARGETS index 8708a379..c645ecf7 100644 --- a/test/end-to-end/built-in-rules/TARGETS +++ b/test/end-to-end/built-in-rules/TARGETS @@ -39,12 +39,12 @@ { "type": ["@", "rules", "test", "suite"] , "stage": ["built-in-rules"] , "deps": - [ "generic_out_dirs" - , "generic_sh" + [ "export_counting" , "filegen_config" - , "tree" + , "generic_out_dirs" + , "generic_sh" , "symlink_config" - , "export_counting" + , "tree" ] } } diff --git a/test/end-to-end/cli/TARGETS b/test/end-to-end/cli/TARGETS index c449a2d4..c9a20eef 100644 --- a/test/end-to-end/cli/TARGETS +++ b/test/end-to-end/cli/TARGETS @@ -32,27 +32,27 @@ { "type": ["@", "rules", "shell/test", "script"] , "name": ["git-cas-P"] , "test": ["git-cas-p.sh"] - , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] + , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] } , "just-mr reporting": { "type": ["@", "rules", "shell/test", "script"] , "name": ["just-mr-reporting"] , "test": ["just-mr-reporting.sh"] - , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] + , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] , "keep": ["log/warning.txt"] } , "install --archive": { "type": ["@", "rules", "shell/test", "script"] , "name": ["install-archive"] , "test": ["install-archive.sh"] - , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] + , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] , "keep": ["src.tar", "reconstructed.tar", "fromstdout.tar"] } , "install archived repo": { "type": ["@", "rules", "shell/test", "script"] , "name": ["install-archived-repo"] , "test": ["install-archived-repo.sh"] - , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] + , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] , "keep": ["src.tar", "reconstructed.tar", "fromstdout.tar"] } , "conflict report": @@ -65,7 +65,7 @@ { "type": ["@", "rules", "shell/test", "script"] , "name": ["log-limit"] , "test": ["log-limit.sh"] - , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] + , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] } , "describe": { "type": ["@", "rules", "shell/test", "script"] @@ -77,7 +77,7 @@ { "type": ["@", "rules", "shell/test", "script"] , "name": ["output"] , "test": ["output.sh"] - , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] + , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] , "keep": ["log"] } , "TESTS": diff --git a/test/end-to-end/gc/TARGETS b/test/end-to-end/gc/TARGETS index 5d3cb38b..5e4bf722 100644 --- a/test/end-to-end/gc/TARGETS +++ b/test/end-to-end/gc/TARGETS @@ -8,25 +8,25 @@ { "type": ["@", "rules", "shell/test", "script"] , "name": ["compactification"] , "test": ["compactification.sh"] - , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] + , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] } , "export": { "type": ["@", "rules", "shell/test", "script"] , "name": ["export"] , "test": ["export.sh"] - , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] + , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] } , "tc-deps": { "type": ["@", "rules", "shell/test", "script"] , "name": ["tc-deps"] , "test": ["tc-deps.sh"] - , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] + , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] } , "reconstruct-executable": { "type": ["@", "rules", "shell/test", "script"] , "name": ["reconstruct-executable"] , "test": ["reconstruct-executable.sh"] - , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] + , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] } , "TESTS": { "type": ["@", "rules", "test", "suite"] @@ -35,8 +35,8 @@ [ "basic" , "compactification" , "export" - , "tc-deps" , "reconstruct-executable" + , "tc-deps" ] } } diff --git a/test/end-to-end/generated-binary/TARGETS b/test/end-to-end/generated-binary/TARGETS index ef876c37..a50e5ddc 100644 --- a/test/end-to-end/generated-binary/TARGETS +++ b/test/end-to-end/generated-binary/TARGETS @@ -12,11 +12,11 @@ , "name": ["compiled"] , "test": ["compiled.sh"] , "keep": ["graph.json", "out/out.txt"] - , "deps": [["", "tool-under-test"], "compile rules"] + , "deps": ["compile rules", ["", "tool-under-test"]] } , "TESTS": { "type": ["@", "rules", "test", "suite"] , "stage": ["generated-binary"] - , "deps": ["shell", "compiled"] + , "deps": ["compiled", "shell"] } } diff --git a/test/end-to-end/git-import/TARGETS b/test/end-to-end/git-import/TARGETS index 6ffe15df..4ff3ff03 100644 --- a/test/end-to-end/git-import/TARGETS +++ b/test/end-to-end/git-import/TARGETS @@ -3,9 +3,9 @@ , "name": ["chained-import"] , "test": ["chained-import.sh"] , "deps": - [ ["end-to-end", "git-import-under-test"] - , ["", "mr-tool-under-test"] + [ ["", "mr-tool-under-test"] , ["", "tool-under-test"] + , ["end-to-end", "git-import-under-test"] ] } , "check-action-equality": @@ -18,11 +18,11 @@ , "name": ["deduplicate"] , "test": ["deduplicate.sh"] , "deps": - [ ["end-to-end", "git-import-under-test"] - , ["end-to-end", "deduplicate-tool-under-test"] + [ "check-action-equality" , ["", "mr-tool-under-test"] , ["", "tool-under-test"] - , "check-action-equality" + , ["end-to-end", "deduplicate-tool-under-test"] + , ["end-to-end", "git-import-under-test"] ] , "keep": ["repos-full.json", "actions-full.json", "repos.json", "actions.json"] @@ -32,9 +32,9 @@ , "name": ["annotations"] , "test": ["annotations.sh"] , "deps": - [ ["end-to-end", "git-import-under-test"] - , ["", "mr-tool-under-test"] + [ ["", "mr-tool-under-test"] , ["", "tool-under-test"] + , ["end-to-end", "git-import-under-test"] ] , "keep": ["repos.json"] } @@ -43,8 +43,8 @@ , "name": ["absent"] , "test": ["absent.sh"] , "deps": - [ ["end-to-end", "git-import-under-test"] - , ["end-to-end", "deduplicate-tool-under-test"] + [ ["end-to-end", "deduplicate-tool-under-test"] + , ["end-to-end", "git-import-under-test"] ] , "keep": ["repos.json", "deduplicated.json"] } diff --git a/test/end-to-end/just-mr/TARGETS b/test/end-to-end/just-mr/TARGETS index 15959fb7..5a47b7a4 100644 --- a/test/end-to-end/just-mr/TARGETS +++ b/test/end-to-end/just-mr/TARGETS @@ -38,8 +38,8 @@ , "test": ["just-mr.test.sh"] , "deps": [ "create_test_archives" - , ["utils", "test_utils_install"] , ["", "mr-tool-under-test"] + , ["utils", "test_utils_install"] ] } , "just_mr_mirrors": @@ -48,9 +48,9 @@ , "test": ["just-mr-mirrors.test.sh"] , "deps": [ "create_test_archives" - , ["utils", "test_utils_install"] - , ["utils", "null server"] , ["", "mr-tool-under-test"] + , ["utils", "null server"] + , ["utils", "test_utils_install"] ] } , "git-tree-verbosity": @@ -122,9 +122,9 @@ , "name": ["fetch-absent-archives"] , "test": ["fetch-absent-archives.sh"] , "deps": - [ ["", "mr-tool-under-test"] + [ "fetch-absent (data)" + , ["", "mr-tool-under-test"] , ["", "tool-under-test"] - , "fetch-absent (data)" ] , "repos": ["fetch-absent (data)"] } @@ -133,9 +133,9 @@ , "name": ["fetch-absent-archives-symlinks"] , "test": ["fetch-absent-archives-symlinks.sh"] , "deps": - [ ["", "mr-tool-under-test"] + [ "fetch-absent-with-symlinks (data)" + , ["", "mr-tool-under-test"] , ["", "tool-under-test"] - , "fetch-absent-with-symlinks (data)" ] , "repos": ["fetch-absent-with-symlinks (data)"] } @@ -144,9 +144,9 @@ , "name": ["fetch-absent-distdir-archive"] , "test": ["fetch-absent-distdir-archive.sh"] , "deps": - [ ["", "mr-tool-under-test"] + [ "fetch-absent (data)" + , ["", "mr-tool-under-test"] , ["", "tool-under-test"] - , "fetch-absent (data)" ] , "repos": ["fetch-absent (data)"] } @@ -191,9 +191,9 @@ , "name": ["reporting-verbosity"] , "test": ["reporting-verbosity.sh"] , "deps": - [ ["", "tool-under-test"] + [ "fetch-absent (data)" , ["", "mr-tool-under-test"] - , "fetch-absent (data)" + , ["", "tool-under-test"] ] } , "stay-local": @@ -201,9 +201,9 @@ , "name": ["stay-local"] , "test": ["stay-local.sh"] , "deps": - [ ["", "tool-under-test"] + [ "fetch-absent (data)" , ["", "mr-tool-under-test"] - , "fetch-absent (data)" + , ["", "tool-under-test"] , ["utils", "null server"] ] } diff --git a/test/end-to-end/remote-execution/TARGETS b/test/end-to-end/remote-execution/TARGETS index 8ab1259e..fbe3d467 100644 --- a/test/end-to-end/remote-execution/TARGETS +++ b/test/end-to-end/remote-execution/TARGETS @@ -2,7 +2,7 @@ { "type": ["end-to-end", "with remote"] , "name": ["native-protocol"] , "test": ["native-protocol.sh"] - , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] + , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] } , "large-blobs": { "type": ["end-to-end", "with remote"] @@ -70,7 +70,7 @@ { "type": ["end-to-end", "with remote"] , "name": ["add-to-cas"] , "test": ["add-to-cas.sh"] - , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] + , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] } , "TESTS": { "type": ["@", "rules", "test", "suite"] diff --git a/test/end-to-end/serve-service/TARGETS b/test/end-to-end/serve-service/TARGETS index 23c0525a..3ab54a14 100644 --- a/test/end-to-end/serve-service/TARGETS +++ b/test/end-to-end/serve-service/TARGETS @@ -2,7 +2,7 @@ { "type": ["end-to-end", "with serve"] , "name": ["serve-target-remote-build"] , "test": ["serve_target_remote_build.sh"] - , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] + , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] , "repos": [ "serve-target-remote-build (repo)" , "serve-target-remote-build (rule)" @@ -14,12 +14,12 @@ , "name": ["serve-target-failed-build"] , "test": ["serve_target_failed_build.sh"] , "deps": - [ ["", "tool-under-test"] - , ["", "mr-tool-under-test"] - , "serve-tree (archive)" - , "data/targets/TARGETS" - , "data/rules/RULES" + [ "data/rules/RULES" , "data/rules/RULES.dummy" + , "data/targets/TARGETS" + , "serve-tree (archive)" + , ["", "mr-tool-under-test"] + , ["", "tool-under-test"] ] , "repos": [ "serve-target-remote-build (repo)" @@ -88,10 +88,10 @@ , "name": ["serve-tree"] , "test": ["serve-tree.sh"] , "deps": - [ ["", "mr-tool-under-test"] - , ["", "tool-under-test"] + [ "data/targets/TARGETS.tree" , "serve-tree (archive)" - , "data/targets/TARGETS.tree" + , ["", "mr-tool-under-test"] + , ["", "tool-under-test"] ] , "repos": ["serve-tree (archive)"] } @@ -104,7 +104,7 @@ { "type": ["end-to-end", "with serve"] , "name": ["serve-target-remote-build-dispatch"] , "test": ["serve_target_remote_build_dispatch.sh"] - , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] + , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] , "repos": ["serve-target-remote-build-dispatch (data)"] } , "serve-query-target-cache-value": @@ -124,9 +124,9 @@ , "name": ["describe"] , "test": ["describe.sh"] , "deps": - [ ["", "mr-tool-under-test"] + [ "describe (locally installed)" + , ["", "mr-tool-under-test"] , ["", "tool-under-test"] - , "describe (locally installed)" ] , "repos": ["describe (data)"] , "keep": ["out/describe.orig", "out/describe"] @@ -140,9 +140,9 @@ , "name": ["failure-report"] , "test": ["failure-report.sh"] , "deps": - [ ["", "mr-tool-under-test"] + [ "describe (locally installed)" + , ["", "mr-tool-under-test"] , ["", "tool-under-test"] - , "describe (locally installed)" ] , "repos": ["failure-report (data)"] , "keep": ["out/log", "out/serve.log", "out/failure.log"] @@ -160,7 +160,7 @@ { "type": ["end-to-end", "with serve"] , "name": ["serve-many-targets"] , "test": ["serve_many_targets.sh"] - , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] + , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] , "repos": ["serve-many-targets (data)", "serve-many-targets (data in module)"] } @@ -168,7 +168,7 @@ { "type": ["end-to-end", "with serve"] , "name": ["deduplication-of-serve-requests"] , "test": ["deduplication_of_serve_requests.sh"] - , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] + , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] , "repos": ["serve-many-targets (data)"] } , "TESTS (unconfigured)": diff --git a/test/end-to-end/serve-service/data/targets/TARGETS.dispatch b/test/end-to-end/serve-service/data/targets/TARGETS.dispatch index 24180bd7..91568434 100644 --- a/test/end-to-end/serve-service/data/targets/TARGETS.dispatch +++ b/test/end-to-end/serve-service/data/targets/TARGETS.dispatch @@ -19,12 +19,12 @@ , "outs": ["out.txt"] , "execution properties": {"type": "singleton_map", "key": "server", "value": "special"} - , "deps": ["payload", "drop"] + , "deps": ["drop", "payload"] } , "internal": { "type": "generic" , "cmds": ["cat out.txt post.txt > final.txt"] - , "deps": ["special-dispatch", "post"] + , "deps": ["post", "special-dispatch"] , "outs": ["final.txt"] } , "": 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 af54b68b..2da72a66 100644 --- a/test/end-to-end/serve-service/serve-archive-root/TARGETS +++ b/test/end-to-end/serve-service/serve-archive-root/TARGETS @@ -60,9 +60,9 @@ , "name": ["resolved-present"] , "test": ["resolved-present.sh"] , "deps": - [ ["", "mr-tool-under-test"] + [ "serve-tree-syms (archive)" + , ["", "mr-tool-under-test"] , ["", "tool-under-test"] - , "serve-tree-syms (archive)" ] , "repos": ["serve-tree-syms (archive)"] } @@ -71,9 +71,9 @@ , "name": ["resolved-absent"] , "test": ["resolved-absent.sh"] , "deps": - [ ["", "mr-tool-under-test"] + [ "serve-tree-syms (archive)" + , ["", "mr-tool-under-test"] , ["", "tool-under-test"] - , "serve-tree-syms (archive)" ] , "repos": ["serve-tree-syms (archive)"] } @@ -82,9 +82,9 @@ , "name": ["resolved-absent-known"] , "test": ["resolved-absent-known.sh"] , "deps": - [ ["", "mr-tool-under-test"] + [ "serve-tree-syms (archive)" + , ["", "mr-tool-under-test"] , ["", "tool-under-test"] - , "serve-tree-syms (archive)" ] , "repos": ["serve-tree-syms (archive)"] } @@ -93,23 +93,23 @@ , "name": ["resolved-absent-known-upload"] , "test": ["resolved-absent-known-upload.sh"] , "deps": - [ ["", "mr-tool-under-test"] + [ "serve-tree-syms (archive)" + , ["", "mr-tool-under-test"] , ["", "tool-under-test"] - , "serve-tree-syms (archive)" ] } , "TESTS": { "type": ["@", "rules", "test", "suite"] , "stage": ["serve-archive-root"] , "deps": - [ "unresolved-present" + [ "resolved-absent" + , "resolved-absent-known" + , "resolved-absent-known-upload" + , "resolved-present" , "unresolved-absent" , "unresolved-absent-known" , "unresolved-absent-known-upload" - , "resolved-present" - , "resolved-absent" - , "resolved-absent-known" - , "resolved-absent-known-upload" + , "unresolved-present" ] } } 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 156806d8..d8b55ee3 100644 --- a/test/end-to-end/serve-service/serve-distdir-root/TARGETS +++ b/test/end-to-end/serve-service/serve-distdir-root/TARGETS @@ -16,9 +16,9 @@ , "name": ["present"] , "test": ["present.sh"] , "deps": - [ ["", "mr-tool-under-test"] + [ "serve-distdir (data)" + , ["", "mr-tool-under-test"] , ["", "tool-under-test"] - , "serve-distdir (data)" ] , "repos": ["serve-distdir (data)"] } @@ -27,9 +27,9 @@ , "name": ["absent"] , "test": ["absent.sh"] , "deps": - [ ["", "mr-tool-under-test"] + [ "serve-distdir (data)" + , ["", "mr-tool-under-test"] , ["", "tool-under-test"] - , "serve-distdir (data)" ] , "repos": ["serve-distdir (data)"] } @@ -38,9 +38,9 @@ , "name": ["upload"] , "test": ["upload.sh"] , "deps": - [ ["", "mr-tool-under-test"] + [ "serve-distdir (data)" + , ["", "mr-tool-under-test"] , ["", "tool-under-test"] - , "serve-distdir (data)" ] } , "foreign-file": @@ -57,6 +57,6 @@ , "TESTS": { "type": ["@", "rules", "test", "suite"] , "stage": ["serve-distdir-root"] - , "deps": ["present", "absent", "upload", "foreign-file"] + , "deps": ["absent", "foreign-file", "present", "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 29ccee00..e73b9d0c 100644 --- a/test/end-to-end/serve-service/serve-git-root/TARGETS +++ b/test/end-to-end/serve-service/serve-git-root/TARGETS @@ -25,6 +25,6 @@ , "TESTS": { "type": ["@", "rules", "test", "suite"] , "stage": ["serve-git-root"] - , "deps": ["present", "absent", "absent-upload"] + , "deps": ["absent", "absent-upload", "present"] } } 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 ffcd5bd4..31b2f7ad 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 @@ -15,6 +15,6 @@ , "TESTS": { "type": ["@", "rules", "test", "suite"] , "stage": ["serve-git-tree-root"] - , "deps": ["present", "absent"] + , "deps": ["absent", "present"] } } diff --git a/test/end-to-end/target-cache/TARGETS b/test/end-to-end/target-cache/TARGETS index 75c0d385..43b8f76d 100644 --- a/test/end-to-end/target-cache/TARGETS +++ b/test/end-to-end/target-cache/TARGETS @@ -2,18 +2,18 @@ { "type": ["end-to-end", "with remote"] , "name": ["target-cache-hit"] , "test": ["target-cache-hit.sh"] - , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] + , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] } , "artifacts-sync": { "type": ["@", "rules", "shell/test", "script"] , "name": ["artifacts-sync"] , "test": ["artifacts-sync.sh"] , "deps": - [ ["", "tool-under-test"] + [ "bootstrap-src-staged" , ["", "mr-tool-under-test"] + , ["", "tool-under-test"] , ["./", "data", "greetlib"] , ["./", "data", "pydicts"] - , "bootstrap-src-staged" ] } , "serve-sync": @@ -21,10 +21,10 @@ , "name": ["serve-sync"] , "test": ["serve-sync.sh"] , "deps": - [ ["", "tool-under-test"] + [ "bootstrap-src-staged" , ["", "mr-tool-under-test"] + , ["", "tool-under-test"] , ["./", "data", "lib with generated hdr"] - , "bootstrap-src-staged" ] , "repos": [["./", "data", "lib with generated hdr"]] } @@ -32,7 +32,7 @@ { "type": ["@", "rules", "shell/test", "script"] , "name": ["export-extern"] , "test": ["export-extern.sh"] - , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] + , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] } , "bootstrap-src-staged": {"type": "install", "dirs": [[["@", "src", "", "bootstrap-src"], "src"]]} @@ -40,7 +40,7 @@ { "type": ["@", "rules", "shell/test", "script"] , "name": ["check-sharding"] , "test": ["check-sharding.sh"] - , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] + , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] } , "TESTS": { "type": ["@", "rules", "test", "suite"] diff --git a/test/end-to-end/target-tests/TARGETS b/test/end-to-end/target-tests/TARGETS index f49d6202..5fc0d6b7 100644 --- a/test/end-to-end/target-tests/TARGETS +++ b/test/end-to-end/target-tests/TARGETS @@ -44,13 +44,13 @@ { "type": ["@", "rules", "test", "suite"] , "stage": ["target-tests"] , "deps": - [ "upwards reference" + [ "configure target name" + , "configure variables" + , "glob expansion" , "repository naming" , "resolution of built-in rules" - , "glob expansion" - , "configure target name" - , "configure variables" , "tree inputs" + , "upwards reference" ] } } diff --git a/test/other_tools/TARGETS b/test/other_tools/TARGETS index 5b92abf7..d12a9ad1 100644 --- a/test/other_tools/TARGETS +++ b/test/other_tools/TARGETS @@ -3,8 +3,8 @@ , "stage": ["other_tools"] , "deps": [ ["./", "git_operations", "TESTS"] - , ["./", "utils", "TESTS"] , ["./", "just_mr", "TESTS"] + , ["./", "utils", "TESTS"] ] } } diff --git a/test/other_tools/git_operations/TARGETS b/test/other_tools/git_operations/TARGETS index 381b97c9..f63258b5 100644 --- a/test/other_tools/git_operations/TARGETS +++ b/test/other_tools/git_operations/TARGETS @@ -5,12 +5,12 @@ , "srcs": ["critical_git_ops.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "fmt", "", "fmt"] , ["@", "json", "", "json"] + , ["@", "src", "src/buildtool/execution_api/common", "common"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/other_tools/ops_maps", "critical_git_op_map"] - , ["@", "src", "src/buildtool/execution_api/common", "common"] + , ["", "catch-main"] , ["utils", "shell_quoting"] ] , "stage": ["test", "other_tools", "git_operations"] @@ -20,7 +20,7 @@ , "name": ["critical_git_ops_mp"] , "test": ["critical_git_ops_mp.sh"] , "deps": - [["buildtool/file_system", "test_data"], "critical_git_ops_test_install"] + ["critical_git_ops_test_install", ["buildtool/file_system", "test_data"]] } , "git_repo_remote": { "type": ["@", "rules", "CC/test", "test"] @@ -29,15 +29,15 @@ , "data": [["buildtool/file_system", "test_data"]] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "fmt", "", "fmt"] , ["@", "json", "", "json"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] - , ["@", "src", "src/other_tools/git_operations", "git_repo_remote"] , ["@", "src", "src/buildtool/storage", "config"] + , ["@", "src", "src/other_tools/git_operations", "git_repo_remote"] , ["@", "src", "src/utils/cpp", "atomic"] + , ["", "catch-main"] , ["utils", "shell_quoting"] , ["utils", "test_storage_config"] ] @@ -50,11 +50,11 @@ , "srcs": ["git_config_run.test.cpp"] , "private-deps": [ ["@", "src", "", "libgit2"] - , ["@", "src", "src/other_tools/git_operations", "git_config_settings"] - , ["@", "src", "src/buildtool/file_system", "git_utils"] , ["@", "src", "src/buildtool/file_system", "git_context"] + , ["@", "src", "src/buildtool/file_system", "git_utils"] , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] + , ["@", "src", "src/other_tools/git_operations", "git_config_settings"] , ["utils", "log_config"] ] , "stage": ["src"] @@ -78,9 +78,9 @@ , "stage": ["git_operations"] , "deps": [ "critical_git_ops_mp" - , "git_repo_remote" - , "git_config_ssl" , "git_config_proxy" + , "git_config_ssl" + , "git_repo_remote" ] } } diff --git a/test/other_tools/just_mr/TARGETS b/test/other_tools/just_mr/TARGETS index d2397e7f..a74921ac 100644 --- a/test/other_tools/just_mr/TARGETS +++ b/test/other_tools/just_mr/TARGETS @@ -4,9 +4,9 @@ , "srcs": ["rc_merge.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "src", "src/buildtool/build_engine/expression", "expression"] , ["@", "src", "src/other_tools/just_mr", "rc_merge"] + , ["", "catch-main"] ] , "stage": ["test", "other_tools", "just_mr"] } @@ -16,14 +16,14 @@ , "srcs": ["mirrors.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "src", "src/other_tools/just_mr", "mirrors"] + , ["", "catch-main"] ] , "stage": ["test", "other_tools", "just_mr"] } , "TESTS": { "type": ["@", "rules", "test", "suite"] , "stage": ["just_mr"] - , "deps": ["rc_merge", "mirrors"] + , "deps": ["mirrors", "rc_merge"] } } diff --git a/test/other_tools/utils/TARGETS b/test/other_tools/utils/TARGETS index 6506de8f..6d7ed56b 100644 --- a/test/other_tools/utils/TARGETS +++ b/test/other_tools/utils/TARGETS @@ -5,10 +5,10 @@ , "srcs": ["curl_usage.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] + , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/other_tools/utils", "curl_context"] , ["@", "src", "src/other_tools/utils", "curl_easy_handle"] - , ["@", "src", "src/buildtool/file_system", "file_system_manager"] + , ["", "catch-main"] ] , "stage": ["test", "other_tools", "utils"] } @@ -16,7 +16,7 @@ { "type": ["@", "rules", "shell/test", "script"] , "name": ["curl_usage"] , "test": ["curl_usage_test.sh"] - , "deps": [["utils", "test_utils_install"], "curl_usage_install"] + , "deps": ["curl_usage_install", ["utils", "test_utils_install"]] } , "curl_url": { "type": ["@", "rules", "CC/test", "test"] @@ -24,14 +24,14 @@ , "srcs": ["curl_url.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "src", "src/other_tools/utils", "curl_url_handle"] + , ["", "catch-main"] ] , "stage": ["test", "other_tools", "utils"] } , "TESTS": { "type": ["@", "rules", "test", "suite"] , "stage": ["utils"] - , "deps": ["curl_usage", "curl_url"] + , "deps": ["curl_url", "curl_usage"] } } diff --git a/test/utils/TARGETS b/test/utils/TARGETS index 6a5fd59a..409ce392 100644 --- a/test/utils/TARGETS +++ b/test/utils/TARGETS @@ -10,15 +10,15 @@ , "name": ["execution_bazel"] , "hdrs": ["remote_execution/bazel_action_creator.hpp"] , "deps": - [ ["@", "gsl", "", "gsl"] - , ["@", "src", "src/buildtool/execution_api/remote", "bazel_network"] - , ["@", "src", "src/buildtool/common", "bazel_types"] - , ["@", "src", "src/buildtool/common", "bazel_digest_factory"] - , ["@", "src", "src/buildtool/common/remote", "retry_config"] + [ "test_auth_config" , "test_env" - , "test_auth_config" , "test_remote_config" + , ["@", "gsl", "", "gsl"] + , ["@", "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"] ] , "stage": ["test", "utils"] } @@ -38,8 +38,8 @@ , "hdrs": ["test_env.hpp"] , "deps": [ "log_config" - , ["@", "src", "src/buildtool/common", "protocol_traits"] , ["@", "src", "src/buildtool/auth", "auth"] + , ["@", "src", "src/buildtool/common", "protocol_traits"] ] , "stage": ["test", "utils"] } @@ -48,13 +48,13 @@ , "name": ["test_storage_config"] , "hdrs": ["hermeticity/test_storage_config.hpp"] , "deps": - [ ["@", "gsl", "", "gsl"] + [ "test_hash_function_type" + , ["@", "gsl", "", "gsl"] + , ["@", "src", "src/buildtool/common", "protocol_traits"] , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] , ["@", "src", "src/buildtool/storage", "config"] , ["@", "src", "src/utils/cpp", "tmp_dir"] - , ["@", "src", "src/buildtool/common", "protocol_traits"] - , "test_hash_function_type" ] , "stage": ["test", "utils"] } @@ -63,10 +63,10 @@ , "name": ["test_hash_function_type"] , "hdrs": ["hermeticity/test_hash_function_type.hpp"] , "deps": - [ ["@", "src", "src/buildtool/crypto", "hash_function"] + [ "test_env" + , ["@", "src", "src/buildtool/crypto", "hash_function"] , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] - , "test_env" ] , "stage": ["test", "utils"] } @@ -86,16 +86,16 @@ , "name": ["catch-main-remote-execution"] , "srcs": ["remote_execution/main-remote-execution.cpp"] , "deps": - [ ["@", "catch2", "", "catch2"] + [ "log_config" + , "test_auth_config" + , "test_env" + , "test_remote_config" + , ["@", "catch2", "", "catch2"] , ["@", "src", "src/buildtool/execution_api/remote", "config"] + , ["@", "src", "src/buildtool/file_system", "file_system_manager"] + , ["@", "src", "src/buildtool/file_system", "git_context"] , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] - , ["@", "src", "src/buildtool/file_system", "git_context"] - , ["@", "src", "src/buildtool/file_system", "file_system_manager"] - , "log_config" - , "test_env" - , "test_auth_config" - , "test_remote_config" ] , "stage": ["test", "utils"] } @@ -104,10 +104,10 @@ , "name": ["test_serve_config"] , "hdrs": ["serve_service/test_serve_config.hpp"] , "deps": - [ ["@", "src", "src/buildtool/serve_api/remote", "config"] + [ "test_env" , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] - , "test_env" + , ["@", "src", "src/buildtool/serve_api/remote", "config"] ] , "stage": ["test", "utils"] } @@ -116,10 +116,10 @@ , "name": ["test_auth_config"] , "hdrs": ["remote_execution/test_auth_config.hpp"] , "deps": - [ ["@", "src", "src/buildtool/auth", "auth"] + [ "test_env" + , ["@", "src", "src/buildtool/auth", "auth"] , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] - , "test_env" ] , "stage": ["test", "utils"] } @@ -128,10 +128,10 @@ , "name": ["test_remote_config"] , "hdrs": ["remote_execution/test_remote_config.hpp"] , "deps": - [ ["@", "src", "src/buildtool/execution_api/remote", "config"] + [ "test_env" + , ["@", "src", "src/buildtool/execution_api/remote", "config"] , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] - , "test_env" ] , "stage": ["test", "utils"] } @@ -140,18 +140,18 @@ , "name": ["catch-main-serve"] , "srcs": ["serve_service/main-serve.cpp"] , "deps": - [ ["@", "catch2", "", "catch2"] + [ "log_config" + , "shell_quoting" + , "test_env" + , "test_serve_config" + , ["@", "catch2", "", "catch2"] + , ["@", "src", "src/buildtool/common", "protocol_traits"] , ["@", "src", "src/buildtool/execution_api/remote", "config"] - , ["@", "src", "src/buildtool/serve_api/remote", "config"] + , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] + , ["@", "src", "src/buildtool/serve_api/remote", "config"] , ["@", "src", "src/buildtool/storage", "storage"] - , ["@", "src", "src/buildtool/file_system", "file_system_manager"] - , ["@", "src", "src/buildtool/common", "protocol_traits"] - , "shell_quoting" - , "log_config" - , "test_env" - , "test_serve_config" ] , "stage": ["test", "utils"] } @@ -186,6 +186,6 @@ , "TESTS": { "type": ["@", "rules", "test", "suite"] , "stage": ["utils"] - , "deps": [["./", "cpp", "TESTS"], ["./", "archive", "TESTS"]] + , "deps": [["./", "archive", "TESTS"], ["./", "cpp", "TESTS"]] } } diff --git a/test/utils/archive/TARGETS b/test/utils/archive/TARGETS index a1aa02c9..41aec44c 100644 --- a/test/utils/archive/TARGETS +++ b/test/utils/archive/TARGETS @@ -4,10 +4,10 @@ , "srcs": ["archive_usage.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] - , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "", "libarchive"] + , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/utils/archive", "archive_ops"] + , ["", "catch-main"] ] , "stage": ["test", "utils", "archive"] } diff --git a/test/utils/cpp/TARGETS b/test/utils/cpp/TARGETS index c7a7e4f8..9a809b47 100644 --- a/test/utils/cpp/TARGETS +++ b/test/utils/cpp/TARGETS @@ -4,8 +4,8 @@ , "srcs": ["path.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "src", "src/utils/cpp", "path"] + , ["", "catch-main"] ] , "stage": ["test", "utils", "cpp"] } @@ -15,8 +15,8 @@ , "srcs": ["path_rebase.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "src", "src/utils/cpp", "path_rebase"] + , ["", "catch-main"] ] , "stage": ["test", "utils", "cpp"] } @@ -26,10 +26,10 @@ , "srcs": ["file_locking.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] - , ["@", "src", "src/utils/cpp", "file_locking"] , ["@", "src", "src/utils/cpp", "atomic"] + , ["@", "src", "src/utils/cpp", "file_locking"] + , ["", "catch-main"] ] , "stage": ["test", "utils", "cpp"] , "private-ldflags": ["-pthread"] @@ -40,14 +40,14 @@ , "srcs": ["prefix.test.cpp"] , "private-deps": [ ["@", "catch2", "", "catch2"] - , ["", "catch-main"] , ["@", "src", "src/utils/cpp", "prefix"] + , ["", "catch-main"] ] , "stage": ["test", "utils", "cpp"] } , "TESTS": { "type": ["@", "rules", "test", "suite"] , "stage": ["cpp"] - , "deps": ["path", "path_rebase", "file_locking", "prefix"] + , "deps": ["file_locking", "path", "path_rebase", "prefix"] } } |