diff options
Diffstat (limited to 'test/buildtool/execution_engine/executor')
4 files changed, 19 insertions, 19 deletions
diff --git a/test/buildtool/execution_engine/executor/TARGETS b/test/buildtool/execution_engine/executor/TARGETS index a3176e91..74247e49 100644 --- a/test/buildtool/execution_engine/executor/TARGETS +++ b/test/buildtool/execution_engine/executor/TARGETS @@ -7,6 +7,7 @@ , ["@", "src", "src/buildtool/common", "artifact_description"] , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/common", "artifact_digest_factory"] + , ["@", "src", "src/buildtool/common", "protocol_traits"] , ["@", "src", "src/buildtool/execution_api/common", "common"] , ["@", "src", "src/buildtool/execution_api/remote", "config"] , ["@", "src", "src/buildtool/execution_api/remote", "context"] @@ -16,7 +17,6 @@ , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/progress_reporting", "progress"] , ["@", "src", "src/buildtool/crypto", "hash_function"] - , ["@", "src", "src/buildtool/compatibility", "compatibility"] , ["@", "catch2", "", "catch2"] , ["@", "gsl", "", "gsl"] , ["utils", "test_api_bundle"] @@ -34,6 +34,7 @@ , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/common", "artifact_digest_factory"] , ["@", "src", "src/buildtool/common", "config"] + , ["@", "src", "src/buildtool/common", "protocol_traits"] , ["@", "src", "src/buildtool/common/remote", "retry_config"] , ["@", "src", "src/buildtool/execution_api/common", "common"] , ["@", "src", "src/buildtool/execution_api/remote", "config"] @@ -43,7 +44,6 @@ , ["@", "src", "src/buildtool/execution_engine/executor", "executor"] , ["@", "src", "src/buildtool/progress_reporting", "progress"] , ["@", "src", "src/buildtool/crypto", "hash_function"] - , ["@", "src", "src/buildtool/compatibility", "compatibility"] , ["", "catch-main"] , ["@", "catch2", "", "catch2"] , ["@", "gsl", "", "gsl"] @@ -84,13 +84,13 @@ [ "executor_api_tests" , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/common", "config"] + , ["@", "src", "src/buildtool/common", "protocol_traits"] , ["@", "src", "src/buildtool/common/remote", "retry_config"] , ["@", "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"] - , ["@", "src", "src/buildtool/compatibility", "compatibility"] , ["utils", "catch-main-remote-execution"] , ["utils", "test_auth_config"] , ["utils", "test_remote_config"] diff --git a/test/buildtool/execution_engine/executor/executor.test.cpp b/test/buildtool/execution_engine/executor/executor.test.cpp index ee950ec0..d0533f9c 100644 --- a/test/buildtool/execution_engine/executor/executor.test.cpp +++ b/test/buildtool/execution_engine/executor/executor.test.cpp @@ -29,9 +29,9 @@ #include "src/buildtool/common/artifact_description.hpp" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/artifact_digest_factory.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/common/statistics.hpp" -#include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" #include "src/buildtool/execution_api/remote/config.hpp" @@ -64,7 +64,7 @@ struct TestApiConfig { }; static auto NamedDigest(std::string const& str) -> ArtifactDigest { - HashFunction const hash_function{Compatibility::IsCompatible() + HashFunction const hash_function{ProtocolTraits::Instance().IsCompatible() ? HashFunction::Type::PlainSHA256 : HashFunction::Type::GitSHA1}; return ArtifactDigestFactory::HashDataAs<ObjectType::File>(hash_function, @@ -305,7 +305,7 @@ TEST_CASE("Executor: Process artifact", "[executor]") { DependencyGraph g; auto [config, repo_config] = CreateTest(&g, workspace_path); - HashFunction const hash_function{Compatibility::IsCompatible() + HashFunction const hash_function{ProtocolTraits::Instance().IsCompatible() ? HashFunction::Type::PlainSHA256 : HashFunction::Type::GitSHA1}; @@ -383,7 +383,7 @@ TEST_CASE("Executor: Process action", "[executor]") { DependencyGraph g; auto [config, repo_config] = CreateTest(&g, workspace_path); - HashFunction const hash_function{Compatibility::IsCompatible() + HashFunction const hash_function{ProtocolTraits::Instance().IsCompatible() ? HashFunction::Type::PlainSHA256 : HashFunction::Type::GitSHA1}; diff --git a/test/buildtool/execution_engine/executor/executor_api.test.hpp b/test/buildtool/execution_engine/executor/executor_api.test.hpp index c898d9e8..570c6e39 100644 --- a/test/buildtool/execution_engine/executor/executor_api.test.hpp +++ b/test/buildtool/execution_engine/executor/executor_api.test.hpp @@ -27,10 +27,10 @@ #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/artifact_description.hpp" #include "src/buildtool/common/artifact_digest_factory.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/common/remote/retry_config.hpp" #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/common/statistics.hpp" -#include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" #include "src/buildtool/execution_api/remote/config.hpp" @@ -56,7 +56,7 @@ static inline void RunBlobUpload(RepositoryConfig* repo_config, ApiFactory const& factory) { SetupConfig(repo_config); auto api = factory(); - HashFunction const hash_function{Compatibility::IsCompatible() + HashFunction const hash_function{ProtocolTraits::Instance().IsCompatible() ? HashFunction::Type::PlainSHA256 : HashFunction::Type::GitSHA1}; @@ -144,7 +144,7 @@ static inline void RunHelloWorldCompilation( .retry_config = &retry_config, .exec_config = &*remote_config}; - HashFunction const hash_function{Compatibility::IsCompatible() + HashFunction const hash_function{ProtocolTraits::Instance().IsCompatible() ? HashFunction::Type::PlainSHA256 : HashFunction::Type::GitSHA1}; @@ -279,7 +279,7 @@ static inline void RunGreeterCompilation( .retry_config = &retry_config, .exec_config = &*remote_config}; - HashFunction const hash_function{Compatibility::IsCompatible() + HashFunction const hash_function{ProtocolTraits::Instance().IsCompatible() ? HashFunction::Type::PlainSHA256 : HashFunction::Type::GitSHA1}; @@ -420,7 +420,7 @@ static inline void TestUploadAndDownloadTrees( env.emplace("PATH", "/bin:/usr/bin"); } - HashFunction const hash_function{Compatibility::IsCompatible() + HashFunction const hash_function{ProtocolTraits::Instance().IsCompatible() ? HashFunction::Type::PlainSHA256 : HashFunction::Type::GitSHA1}; @@ -576,7 +576,7 @@ static inline void TestRetrieveOutputDirectories( int /*expected_cached*/ = 0) { SetupConfig(repo_config); - HashFunction const hash_function{Compatibility::IsCompatible() + HashFunction const hash_function{ProtocolTraits::Instance().IsCompatible() ? HashFunction::Type::PlainSHA256 : HashFunction::Type::GitSHA1}; diff --git a/test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp b/test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp index 0e068ea9..fd2167a7 100644 --- a/test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp +++ b/test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp @@ -15,10 +15,10 @@ #include <optional> #include "catch2/catch_test_macros.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/common/remote/retry_config.hpp" #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/common/statistics.hpp" -#include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_api.hpp" #include "src/buildtool/execution_api/remote/config.hpp" @@ -41,7 +41,7 @@ TEST_CASE("Executor<BazelApi>: Upload blob", "[executor]") { RetryConfig retry_config{}; // default retry config - HashFunction const hash_function{Compatibility::IsCompatible() + HashFunction const hash_function{ProtocolTraits::Instance().IsCompatible() ? HashFunction::Type::PlainSHA256 : HashFunction::Type::GitSHA1}; @@ -72,7 +72,7 @@ TEST_CASE("Executor<BazelApi>: Compile hello world", "[executor]") { RetryConfig retry_config{}; // default retry config - HashFunction const hash_function{Compatibility::IsCompatible() + HashFunction const hash_function{ProtocolTraits::Instance().IsCompatible() ? HashFunction::Type::PlainSHA256 : HashFunction::Type::GitSHA1}; @@ -110,7 +110,7 @@ TEST_CASE("Executor<BazelApi>: Compile greeter", "[executor]") { RetryConfig retry_config{}; // default retry config - HashFunction const hash_function{Compatibility::IsCompatible() + HashFunction const hash_function{ProtocolTraits::Instance().IsCompatible() ? HashFunction::Type::PlainSHA256 : HashFunction::Type::GitSHA1}; @@ -148,7 +148,7 @@ TEST_CASE("Executor<BazelApi>: Upload and download trees", "[executor]") { RetryConfig retry_config{}; // default retry config - HashFunction const hash_function{Compatibility::IsCompatible() + HashFunction const hash_function{ProtocolTraits::Instance().IsCompatible() ? HashFunction::Type::PlainSHA256 : HashFunction::Type::GitSHA1}; @@ -186,7 +186,7 @@ TEST_CASE("Executor<BazelApi>: Retrieve output directories", "[executor]") { RetryConfig retry_config{}; // default retry config - HashFunction const hash_function{Compatibility::IsCompatible() + HashFunction const hash_function{ProtocolTraits::Instance().IsCompatible() ? HashFunction::Type::PlainSHA256 : HashFunction::Type::GitSHA1}; |