summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMaksim Denisov <denisov.maksim@huawei.com>2024-08-29 15:51:14 +0200
committerMaksim Denisov <denisov.maksim@huawei.com>2024-08-30 17:17:09 +0200
commit07d2416af7bf059456f2cda2537309b521757b9c (patch)
tree63834011446d2178e4a43c10b810a977e0b73bdd /test
parentd8d6d1fd3215da794e86bbaeb97cad7418908eed (diff)
downloadjustbuild-07d2416af7bf059456f2cda2537309b521757b9c.tar.gz
Replace bazel_re::Digest in BazelMsgFactory (trees)
...with ArtifactDigest.
Diffstat (limited to 'test')
-rw-r--r--test/buildtool/execution_api/bazel/TARGETS1
-rw-r--r--test/buildtool/execution_api/bazel/bazel_msg_factory.test.cpp9
2 files changed, 4 insertions, 6 deletions
diff --git a/test/buildtool/execution_api/bazel/TARGETS b/test/buildtool/execution_api/bazel/TARGETS
index b0f8e2eb..18a9e012 100644
--- a/test/buildtool/execution_api/bazel/TARGETS
+++ b/test/buildtool/execution_api/bazel/TARGETS
@@ -103,7 +103,6 @@
, "src/buildtool/execution_api/common"
, "artifact_blob_container"
]
- , ["@", "src", "src/buildtool/execution_api/bazel_msg", "bazel_msg"]
, ["@", "src", "src/buildtool/file_system", "file_system_manager"]
]
, "stage": ["test", "buildtool", "execution_api", "bazel"]
diff --git a/test/buildtool/execution_api/bazel/bazel_msg_factory.test.cpp b/test/buildtool/execution_api/bazel/bazel_msg_factory.test.cpp
index 8fca672b..a775ef4d 100644
--- a/test/buildtool/execution_api/bazel/bazel_msg_factory.test.cpp
+++ b/test/buildtool/execution_api/bazel/bazel_msg_factory.test.cpp
@@ -24,7 +24,6 @@
#include "src/buildtool/common/artifact_digest.hpp"
#include "src/buildtool/compatibility/compatibility.hpp"
#include "src/buildtool/crypto/hash_function.hpp"
-#include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp"
#include "src/buildtool/execution_api/common/artifact_blob_container.hpp"
#include "src/buildtool/file_system/file_system_manager.hpp"
#include "src/buildtool/file_system/object_type.hpp"
@@ -105,16 +104,16 @@ TEST_CASE("Bazel internals: MessageFactory", "[execution_api]") {
// a mapping between digests and content is needed; usually via a concrete
// API one gets this content either locally or from the network
- std::unordered_map<bazel_re::Digest, std::filesystem::path> fake_cas{
+ std::unordered_map<ArtifactDigest, std::filesystem::path> fake_cas{
{file1_blob->digest, file1},
{file2_blob->digest, file2},
{link_blob->digest, link}};
// create blobs via tree
- BazelBlobContainer blobs{};
+ ArtifactBlobContainer blobs{};
REQUIRE(BazelMsgFactory::CreateDirectoryDigestFromTree(
*tree,
- [&fake_cas](std::vector<bazel_re::Digest> const& digests,
+ [&fake_cas](std::vector<ArtifactDigest> const& digests,
std::vector<std::string>* targets) {
targets->reserve(digests.size());
for (auto const& digest : digests) {
@@ -133,7 +132,7 @@ TEST_CASE("Bazel internals: MessageFactory", "[execution_api]") {
}
}
},
- [&blobs](BazelBlob&& blob) {
+ [&blobs](ArtifactBlob&& blob) {
blobs.Emplace(std::move(blob));
return true;
}));