summaryrefslogtreecommitdiff
path: root/test/buildtool/storage
diff options
context:
space:
mode:
authorMaksim Denisov <denisov.maksim@huawei.com>2024-06-17 11:28:47 +0200
committerMaksim Denisov <denisov.maksim@huawei.com>2024-07-05 12:58:35 +0200
commitc88585ddf9386fb14154a4f3baa702569d55584a (patch)
tree05461204866831ab88364981390dae474f16247d /test/buildtool/storage
parent8c73c618d777a07c017ec0deefe88db83652827e (diff)
downloadjustbuild-c88585ddf9386fb14154a4f3baa702569d55584a.tar.gz
Use StorageConfig functionality via Instance()
...to track changes during refactoring easier.
Diffstat (limited to 'test/buildtool/storage')
-rw-r--r--test/buildtool/storage/large_object_cas.test.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/test/buildtool/storage/large_object_cas.test.cpp b/test/buildtool/storage/large_object_cas.test.cpp
index dae2a29a..8723208e 100644
--- a/test/buildtool/storage/large_object_cas.test.cpp
+++ b/test/buildtool/storage/large_object_cas.test.cpp
@@ -100,7 +100,8 @@ class Tree final {
TEST_CASE_METHOD(HermeticLocalTestFixture,
"LargeObjectCAS: split a small tree",
"[storage]") {
- auto temp_dir = StorageConfig::CreateTypedTmpDir("large_object_cas");
+ auto temp_dir =
+ StorageConfig::Instance().CreateTypedTmpDir("large_object_cas");
REQUIRE(temp_dir);
auto const& cas = Storage::Instance().CAS();
@@ -199,7 +200,9 @@ static void TestLarge() noexcept {
CHECK(pack_3->size() == pack_1->size());
// Check there are no spliced results in all generations:
- for (std::size_t i = 0; i < StorageConfig::NumGenerations(); ++i) {
+ for (std::size_t i = 0;
+ i < StorageConfig::Instance().NumGenerations();
+ ++i) {
auto generation_path =
kIsTree ? Storage::Generation(i).CAS().TreePath(digest)
: Storage::Generation(i).CAS().BlobPath(digest,
@@ -603,7 +606,8 @@ TEST_CASE_METHOD(HermeticLocalTestFixture,
REQUIRE(split_nested_blob_2);
// Check there are no spliced results in old generations:
- for (std::size_t i = 1; i < StorageConfig::NumGenerations(); ++i) {
+ for (std::size_t i = 1; i < StorageConfig::Instance().NumGenerations();
+ ++i) {
auto const& generation_cas = Storage::Generation(i).CAS();
REQUIRE_FALSE(generation_cas.TreePath(*nested_tree_digest));
REQUIRE_FALSE(generation_cas.TreePath(*large_tree_digest));