summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/buildtool/build_engine/target_map/target_map.test.cpp25
1 files changed, 17 insertions, 8 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 67f21c0b..c2be76df 100644
--- a/test/buildtool/build_engine/target_map/target_map.test.cpp
+++ b/test/buildtool/build_engine/target_map/target_map.test.cpp
@@ -27,6 +27,7 @@
#include "src/buildtool/build_engine/target_map/target_map.hpp"
#include "src/buildtool/common/repository_config.hpp"
#include "src/buildtool/common/statistics.hpp"
+#include "src/buildtool/execution_api/common/api_bundle.hpp"
#include "src/buildtool/file_system/file_root.hpp"
#include "src/buildtool/main/analyse_context.hpp"
#include "src/buildtool/multithreading/async_map_consumer.hpp"
@@ -98,7 +99,8 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, "simple targets", "[target_map]") {
auto serve_config = TestServeConfig::ReadServeConfigFromEnvironment();
REQUIRE(serve_config);
- auto serve = ServeApi::Create(*serve_config);
+ ApiBundle const apis{std::nullopt, RemoteExecutionConfig::RemoteAddress()};
+ auto serve = ServeApi::Create(*serve_config, &apis);
AnalyseContext ctx{.repo_config = &repo_config,
.target_cache = Storage::Instance().TargetCache(),
.statistics = &stats,
@@ -540,7 +542,8 @@ TEST_CASE_METHOD(HermeticLocalTestFixture,
auto serve_config = TestServeConfig::ReadServeConfigFromEnvironment();
REQUIRE(serve_config);
- auto serve = ServeApi::Create(*serve_config);
+ ApiBundle const apis{std::nullopt, RemoteExecutionConfig::RemoteAddress()};
+ auto serve = ServeApi::Create(*serve_config, &apis);
AnalyseContext ctx{.repo_config = &repo_config,
.target_cache = Storage::Instance().TargetCache(),
.statistics = &stats,
@@ -627,7 +630,8 @@ TEST_CASE_METHOD(HermeticLocalTestFixture,
auto serve_config = TestServeConfig::ReadServeConfigFromEnvironment();
REQUIRE(serve_config);
- auto serve = ServeApi::Create(*serve_config);
+ ApiBundle const apis{std::nullopt, RemoteExecutionConfig::RemoteAddress()};
+ auto serve = ServeApi::Create(*serve_config, &apis);
AnalyseContext ctx{.repo_config = &repo_config,
.target_cache = Storage::Instance().TargetCache(),
.statistics = &stats,
@@ -724,7 +728,8 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, "built-in rules", "[target_map]") {
auto serve_config = TestServeConfig::ReadServeConfigFromEnvironment();
REQUIRE(serve_config);
- auto serve = ServeApi::Create(*serve_config);
+ ApiBundle const apis{std::nullopt, RemoteExecutionConfig::RemoteAddress()};
+ auto serve = ServeApi::Create(*serve_config, &apis);
AnalyseContext ctx{.repo_config = &repo_config,
.target_cache = Storage::Instance().TargetCache(),
.statistics = &stats,
@@ -931,7 +936,8 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, "target reference", "[target_map]") {
auto serve_config = TestServeConfig::ReadServeConfigFromEnvironment();
REQUIRE(serve_config);
- auto serve = ServeApi::Create(*serve_config);
+ ApiBundle const apis{std::nullopt, RemoteExecutionConfig::RemoteAddress()};
+ auto serve = ServeApi::Create(*serve_config, &apis);
AnalyseContext ctx{.repo_config = &repo_config,
.target_cache = Storage::Instance().TargetCache(),
.statistics = &stats,
@@ -1071,7 +1077,8 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, "trees", "[target_map]") {
auto serve_config = TestServeConfig::ReadServeConfigFromEnvironment();
REQUIRE(serve_config);
- auto serve = ServeApi::Create(*serve_config);
+ ApiBundle const apis{std::nullopt, RemoteExecutionConfig::RemoteAddress()};
+ auto serve = ServeApi::Create(*serve_config, &apis);
AnalyseContext ctx{.repo_config = &repo_config,
.target_cache = Storage::Instance().TargetCache(),
.statistics = &stats,
@@ -1177,7 +1184,8 @@ TEST_CASE_METHOD(HermeticLocalTestFixture,
auto serve_config = TestServeConfig::ReadServeConfigFromEnvironment();
REQUIRE(serve_config);
- auto serve = ServeApi::Create(*serve_config);
+ ApiBundle const apis{std::nullopt, RemoteExecutionConfig::RemoteAddress()};
+ auto serve = ServeApi::Create(*serve_config, &apis);
AnalyseContext ctx{.repo_config = &repo_config,
.target_cache = Storage::Instance().TargetCache(),
.statistics = &stats,
@@ -1340,7 +1348,8 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, "wrong arguments", "[target_map]") {
auto serve_config = TestServeConfig::ReadServeConfigFromEnvironment();
REQUIRE(serve_config);
- auto serve = ServeApi::Create(*serve_config);
+ ApiBundle const apis{std::nullopt, RemoteExecutionConfig::RemoteAddress()};
+ auto serve = ServeApi::Create(*serve_config, &apis);
AnalyseContext ctx{.repo_config = &repo_config,
.target_cache = Storage::Instance().TargetCache(),
.statistics = &stats,