2 files changed, 21 insertions, 18 deletions
diff --git a/test/buildtool/execution_engine/executor/executor_api.test.hpp b/test/buildtool/execution_engine/executor/executor_api.test.hpp
index 48d37d98..8459569b 100755
--- a/test/buildtool/execution_engine/executor/executor_api.test.hpp
+++ b/test/buildtool/execution_engine/executor/executor_api.test.hpp
@@ -8,6 +8,7 @@
 #include "src/buildtool/common/artifact_description.hpp"
 #include "src/buildtool/common/artifact_factory.hpp"
 #include "src/buildtool/execution_api/common/execution_api.hpp"
+#include "src/buildtool/execution_api/remote/config.hpp"
 #include "src/buildtool/execution_engine/dag/dag.hpp"
 #include "src/buildtool/execution_engine/executor/executor.hpp"
 #include "src/buildtool/file_system/file_system_manager.hpp"
@@ -84,7 +85,7 @@ static inline void RunHelloWorldCompilation(ApiFactory const& factory,
     CHECK(g.ArtifactNodeWithId(exec_id)->HasBuilderAction());
 
     auto api = factory();
-    Executor runner{api.get(), ReadPlatformPropertiesFromEnv()};
+    Executor runner{api.get(), RemoteExecutionConfig::PlatformProperties()};
 
     // upload local artifacts
     auto const* main_cpp_node = g.ArtifactNodeWithId(main_cpp_id);
@@ -185,7 +186,7 @@ static inline void RunGreeterCompilation(ApiFactory const& factory,
     CHECK(g.Add({compile_greet_desc, make_lib_desc, make_exe_desc}));
 
     auto api = factory();
-    Executor runner{api.get(), ReadPlatformPropertiesFromEnv()};
+    Executor runner{api.get(), RemoteExecutionConfig::PlatformProperties()};
 
     // upload local artifacts
     for (auto const& id : {greet_hpp_id, greet_cpp_id, main_cpp_id}) {
@@ -284,7 +285,7 @@ static inline void TestUploadAndDownloadTrees(ApiFactory const& factory,
     auto foo_id = g.AddArtifact(foo_desc);
     auto bar_id = g.AddArtifact(bar_desc);
 
-    Executor runner{api.get(), ReadPlatformPropertiesFromEnv()};
+    Executor runner{api.get(), RemoteExecutionConfig::PlatformProperties()};
     REQUIRE(runner.Process(g.ArtifactNodeWithId(foo_id)));
     REQUIRE(runner.Process(g.ArtifactNodeWithId(bar_id)));
 
@@ -422,7 +423,7 @@ static inline void TestRetrieveOutputDirectories(ApiFactory const& factory,
 
         // run action
         auto api = factory();
-        Executor runner{api.get(), ReadPlatformPropertiesFromEnv()};
+        Executor runner{api.get(), RemoteExecutionConfig::PlatformProperties()};
         REQUIRE(runner.Process(action));
 
         // read output
@@ -465,7 +466,7 @@ static inline void TestRetrieveOutputDirectories(ApiFactory const& factory,
 
         // run action
         auto api = factory();
-        Executor runner{api.get(), ReadPlatformPropertiesFromEnv()};
+        Executor runner{api.get(), RemoteExecutionConfig::PlatformProperties()};
         REQUIRE(runner.Process(action));
 
         // read output
@@ -524,7 +525,7 @@ static inline void TestRetrieveOutputDirectories(ApiFactory const& factory,
 
         // run action
         auto api = factory();
-        Executor runner{api.get(), ReadPlatformPropertiesFromEnv()};
+        Executor runner{api.get(), RemoteExecutionConfig::PlatformProperties()};
         REQUIRE(runner.Process(action));
 
         // read output
@@ -588,7 +589,8 @@ static inline void TestRetrieveOutputDirectories(ApiFactory const& factory,
 
             // run action
             auto api = factory();
-            Executor runner{api.get(), ReadPlatformPropertiesFromEnv()};
+            Executor runner{api.get(),
+                            RemoteExecutionConfig::PlatformProperties()};
             CHECK_FALSE(runner.Process(action));
         }
 
@@ -606,7 +608,8 @@ static inline void TestRetrieveOutputDirectories(ApiFactory const& factory,
 
             // run action
             auto api = factory();
-            Executor runner{api.get(), ReadPlatformPropertiesFromEnv()};
+            Executor runner{api.get(),
+                            RemoteExecutionConfig::PlatformProperties()};
             CHECK_FALSE(runner.Process(action));
         }
     }
diff --git a/test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp b/test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp
index d6ad57b1..ea68298b 100755
--- a/test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp
+++ b/test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp
@@ -6,11 +6,11 @@
 
 TEST_CASE("Executor<BazelApi>: Upload blob", "[executor]") {
     ExecutionConfiguration config;
-    auto const& info = RemoteExecutionConfig::Instance();
+    auto const& info = RemoteExecutionConfig::RemoteAddress();
 
     TestBlobUpload([&] {
         return BazelApi::Ptr{
-            new BazelApi{"remote-execution", info.Host(), info.Port(), config}};
+            new BazelApi{"remote-execution", info->host, info->port, config}};
     });
 }
 
@@ -18,12 +18,12 @@ TEST_CASE("Executor<BazelApi>: Compile hello world", "[executor]") {
     ExecutionConfiguration config;
     config.skip_cache_lookup = false;
 
-    auto const& info = RemoteExecutionConfig::Instance();
+    auto const& info = RemoteExecutionConfig::RemoteAddress();
 
     TestHelloWorldCompilation(
         [&] {
             return BazelApi::Ptr{new BazelApi{
-                "remote-execution", info.Host(), info.Port(), config}};
+                "remote-execution", info->host, info->port, config}};
         },
         false /* not hermetic */);
 }
@@ -32,12 +32,12 @@ TEST_CASE("Executor<BazelApi>: Compile greeter", "[executor]") {
     ExecutionConfiguration config;
     config.skip_cache_lookup = false;
 
-    auto const& info = RemoteExecutionConfig::Instance();
+    auto const& info = RemoteExecutionConfig::RemoteAddress();
 
     TestGreeterCompilation(
         [&] {
             return BazelApi::Ptr{new BazelApi{
-                "remote-execution", info.Host(), info.Port(), config}};
+                "remote-execution", info->host, info->port, config}};
         },
         false /* not hermetic */);
 }
@@ -46,12 +46,12 @@ TEST_CASE("Executor<BazelApi>: Upload and download trees", "[executor]") {
     ExecutionConfiguration config;
     config.skip_cache_lookup = false;
 
-    auto const& info = RemoteExecutionConfig::Instance();
+    auto const& info = RemoteExecutionConfig::RemoteAddress();
 
     TestUploadAndDownloadTrees(
         [&] {
             return BazelApi::Ptr{new BazelApi{
-                "remote-execution", info.Host(), info.Port(), config}};
+                "remote-execution", info->host, info->port, config}};
         },
         false /* not hermetic */);
 }
@@ -60,12 +60,12 @@ TEST_CASE("Executor<BazelApi>: Retrieve output directories", "[executor]") {
     ExecutionConfiguration config;
     config.skip_cache_lookup = false;
 
-    auto const& info = RemoteExecutionConfig::Instance();
+    auto const& info = RemoteExecutionConfig::RemoteAddress();
 
     TestRetrieveOutputDirectories(
         [&] {
             return BazelApi::Ptr{new BazelApi{
-                "remote-execution", info.Host(), info.Port(), config}};
+                "remote-execution", info->host, info->port, config}};
         },
         false /* not hermetic */);
 }