summaryrefslogtreecommitdiff
path: root/test/buildtool/execution_engine/executor
diff options
context:
space:
mode:
authorMaksim Denisov <denisov.maksim@huawei.com>2024-05-27 14:57:15 +0200
committerMaksim Denisov <denisov.maksim@huawei.com>2024-05-28 16:19:19 +0200
commitfd8ad0f561dd253bf7399ce9a4594242e918ca25 (patch)
treed72aa981cafc03d0f1aded827cb621fabe541fff /test/buildtool/execution_engine/executor
parent9bdd30f307b83a3901250a51780f308f5c4a0065 (diff)
downloadjustbuild-fd8ad0f561dd253bf7399ce9a4594242e918ca25.tar.gz
Use ArtifactBlobContainer in IExecutionApi
...instead of BazelBlobContainer to not bring bazel_re::Digest to IExecutionApi.
Diffstat (limited to 'test/buildtool/execution_engine/executor')
-rw-r--r--test/buildtool/execution_engine/executor/executor.test.cpp2
-rw-r--r--test/buildtool/execution_engine/executor/executor_api.test.hpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/test/buildtool/execution_engine/executor/executor.test.cpp b/test/buildtool/execution_engine/executor/executor.test.cpp
index 7a09dc84..69e06df9 100644
--- a/test/buildtool/execution_engine/executor/executor.test.cpp
+++ b/test/buildtool/execution_engine/executor/executor.test.cpp
@@ -174,7 +174,7 @@ class TestApi : public IExecutionApi {
-> std::optional<std::string> override {
return std::nullopt; // not needed by Executor
}
- auto Upload(BazelBlobContainer const& blobs, bool /*unused*/) noexcept
+ auto Upload(ArtifactBlobContainer&& blobs, bool /*unused*/) noexcept
-> bool final {
auto blob_range = blobs.Blobs();
return std::all_of(
diff --git a/test/buildtool/execution_engine/executor/executor_api.test.hpp b/test/buildtool/execution_engine/executor/executor_api.test.hpp
index c8ec19d7..8c3c84ca 100644
--- a/test/buildtool/execution_engine/executor/executor_api.test.hpp
+++ b/test/buildtool/execution_engine/executor/executor_api.test.hpp
@@ -51,7 +51,7 @@ static inline void RunBlobUpload(RepositoryConfig* repo_config,
SetupConfig(repo_config);
auto api = factory();
std::string const blob = "test";
- CHECK(api->Upload(BazelBlobContainer{{BazelBlob{
+ CHECK(api->Upload(ArtifactBlobContainer{{ArtifactBlob{
ArtifactDigest{HashFunction::ComputeBlobHash(blob).HexString(),
blob.size(),
/*is_tree=*/false},
@@ -382,9 +382,9 @@ static inline void TestUploadAndDownloadTrees(
// upload blobs
auto api = factory();
- REQUIRE(api->Upload(
- BazelBlobContainer{{BazelBlob{foo_digest, foo, /*is_exec=*/false},
- BazelBlob{bar_digest, bar, /*is_exec=*/false}}}));
+ REQUIRE(api->Upload(ArtifactBlobContainer{
+ {ArtifactBlob{foo_digest, foo, /*is_exec=*/false},
+ ArtifactBlob{bar_digest, bar, /*is_exec=*/false}}}));
// define known artifacts
auto foo_desc = ArtifactDescription{foo_digest, ObjectType::File};