diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-06-27 13:27:06 +0200 |
|---|---|---|
| committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-07-05 13:32:39 +0200 |
| commit | 9f5dcef077a3db2f6c791e403e5036f6464c9576 (patch) | |
| tree | 5e14f016207af83a8d0458a7ffe960ecba56280d /test/buildtool/build_engine/target_map/target_map.test.cpp | |
| parent | 0d8a4ad15b93283cc31787b039051b9e9a285ba8 (diff) | |
| download | justbuild-9f5dcef077a3db2f6c791e403e5036f6464c9576.tar.gz | |
Pass StorageConfig and Storage to LocalApi
Diffstat (limited to 'test/buildtool/build_engine/target_map/target_map.test.cpp')
| -rw-r--r-- | test/buildtool/build_engine/target_map/target_map.test.cpp | 57 |
1 files changed, 41 insertions, 16 deletions
diff --git a/test/buildtool/build_engine/target_map/target_map.test.cpp b/test/buildtool/build_engine/target_map/target_map.test.cpp index e392902b..a3e1d350 100644 --- a/test/buildtool/build_engine/target_map/target_map.test.cpp +++ b/test/buildtool/build_engine/target_map/target_map.test.cpp @@ -36,6 +36,7 @@ #include "src/buildtool/progress_reporting/progress.hpp" #include "src/buildtool/serve_api/remote/config.hpp" #include "src/buildtool/serve_api/remote/serve_api.hpp" +#include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/storage.hpp" #include "test/utils/hermeticity/local.hpp" #include "test/utils/serve_service/test_serve_config.hpp" @@ -101,8 +102,11 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, "simple targets", "[target_map]") { REQUIRE(serve_config); Auth auth{}; - ApiBundle const apis{ - /*repo_config=*/nullptr, &auth, RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{&StorageConfig::Instance(), + &Storage::Instance(), + /*repo_config=*/nullptr, + &auth, + RemoteExecutionConfig::RemoteAddress()}; auto serve = ServeApi::Create(*serve_config, &Storage::Instance(), &apis); AnalyseContext ctx{.repo_config = &repo_config, .target_cache = &Storage::Instance().TargetCache(), @@ -546,8 +550,11 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, REQUIRE(serve_config); Auth auth{}; - ApiBundle const apis{ - /*repo_config=*/nullptr, &auth, RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{&StorageConfig::Instance(), + &Storage::Instance(), + /*repo_config=*/nullptr, + &auth, + RemoteExecutionConfig::RemoteAddress()}; auto serve = ServeApi::Create(*serve_config, &Storage::Instance(), &apis); AnalyseContext ctx{.repo_config = &repo_config, .target_cache = &Storage::Instance().TargetCache(), @@ -636,8 +643,11 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, REQUIRE(serve_config); Auth auth{}; - ApiBundle const apis{ - /*repo_config=*/nullptr, &auth, RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{&StorageConfig::Instance(), + &Storage::Instance(), + /*repo_config=*/nullptr, + &auth, + RemoteExecutionConfig::RemoteAddress()}; auto serve = ServeApi::Create(*serve_config, &Storage::Instance(), &apis); AnalyseContext ctx{.repo_config = &repo_config, .target_cache = &Storage::Instance().TargetCache(), @@ -736,8 +746,11 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, "built-in rules", "[target_map]") { REQUIRE(serve_config); Auth auth{}; - ApiBundle const apis{ - /*repo_config=*/nullptr, &auth, RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{&StorageConfig::Instance(), + &Storage::Instance(), + /*repo_config=*/nullptr, + &auth, + RemoteExecutionConfig::RemoteAddress()}; auto serve = ServeApi::Create(*serve_config, &Storage::Instance(), &apis); AnalyseContext ctx{.repo_config = &repo_config, .target_cache = &Storage::Instance().TargetCache(), @@ -946,8 +959,11 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, "target reference", "[target_map]") { REQUIRE(serve_config); Auth auth{}; - ApiBundle const apis{ - /*repo_config=*/nullptr, &auth, RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{&StorageConfig::Instance(), + &Storage::Instance(), + /*repo_config=*/nullptr, + &auth, + RemoteExecutionConfig::RemoteAddress()}; auto serve = ServeApi::Create(*serve_config, &Storage::Instance(), &apis); AnalyseContext ctx{.repo_config = &repo_config, .target_cache = &Storage::Instance().TargetCache(), @@ -1089,8 +1105,11 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, "trees", "[target_map]") { REQUIRE(serve_config); Auth auth{}; - ApiBundle const apis{ - /*repo_config=*/nullptr, &auth, RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{&StorageConfig::Instance(), + &Storage::Instance(), + /*repo_config=*/nullptr, + &auth, + RemoteExecutionConfig::RemoteAddress()}; auto serve = ServeApi::Create(*serve_config, &Storage::Instance(), &apis); AnalyseContext ctx{.repo_config = &repo_config, .target_cache = &Storage::Instance().TargetCache(), @@ -1198,8 +1217,11 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, REQUIRE(serve_config); Auth auth{}; - ApiBundle const apis{ - /*repo_config=*/nullptr, &auth, RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{&StorageConfig::Instance(), + &Storage::Instance(), + /*repo_config=*/nullptr, + &auth, + RemoteExecutionConfig::RemoteAddress()}; auto serve = ServeApi::Create(*serve_config, &Storage::Instance(), &apis); AnalyseContext ctx{.repo_config = &repo_config, .target_cache = &Storage::Instance().TargetCache(), @@ -1364,8 +1386,11 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, "wrong arguments", "[target_map]") { REQUIRE(serve_config); Auth auth{}; - ApiBundle const apis{ - /*repo_config=*/nullptr, &auth, RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{&StorageConfig::Instance(), + &Storage::Instance(), + /*repo_config=*/nullptr, + &auth, + RemoteExecutionConfig::RemoteAddress()}; auto serve = ServeApi::Create(*serve_config, &Storage::Instance(), &apis); AnalyseContext ctx{.repo_config = &repo_config, .target_cache = &Storage::Instance().TargetCache(), |