From 9a9409e44b8ad5a68f38f918e5e026875732b574 Mon Sep 17 00:00:00 2001
From: Maksim Denisov <denisov.maksim@huawei.com>
Date: Fri, 19 Jul 2024 12:14:28 +0200
Subject: Pass HashFunction to BazelApi

---
 test/buildtool/execution_engine/executor/TARGETS   |  2 ++
 .../executor/executor_api_remote_bazel.test.cpp    | 37 +++++++++++++++++++---
 2 files changed, 34 insertions(+), 5 deletions(-)
 mode change 100755 => 100644 test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp

(limited to 'test/buildtool/execution_engine/executor')

diff --git a/test/buildtool/execution_engine/executor/TARGETS b/test/buildtool/execution_engine/executor/TARGETS
index 59acfa43..cb33854a 100644
--- a/test/buildtool/execution_engine/executor/TARGETS
+++ b/test/buildtool/execution_engine/executor/TARGETS
@@ -76,6 +76,8 @@
     , ["@", "src", "src/buildtool/execution_api/remote", "config"]
     , ["@", "src", "src/buildtool/execution_engine/executor", "executor"]
     , ["@", "src", "src/buildtool/progress_reporting", "progress"]
+    , ["@", "src", "src/buildtool/crypto", "hash_function"]
+    , ["@", "src", "src/buildtool/compatibility", "compatibility"]
     , ["utils", "catch-main-remote-execution"]
     , ["utils", "test_auth_config"]
     , ["utils", "test_remote_config"]
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
old mode 100755
new mode 100644
index dd6cc23e..f97de299
--- a/test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp
+++ b/test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp
@@ -18,6 +18,8 @@
 #include "src/buildtool/common/remote/retry_config.hpp"
 #include "src/buildtool/common/repository_config.hpp"
 #include "src/buildtool/common/statistics.hpp"
+#include "src/buildtool/compatibility/compatibility.hpp"
+#include "src/buildtool/crypto/hash_function.hpp"
 #include "src/buildtool/execution_api/remote/bazel/bazel_api.hpp"
 #include "src/buildtool/execution_api/remote/config.hpp"
 #include "src/buildtool/execution_engine/executor/executor.hpp"
@@ -39,13 +41,18 @@ TEST_CASE("Executor<BazelApi>: Upload blob", "[executor]") {
 
     RetryConfig retry_config{};  // default retry config
 
+    HashFunction const hash_function{Compatibility::IsCompatible()
+                                         ? HashFunction::JustHash::Compatible
+                                         : HashFunction::JustHash::Native};
+
     TestBlobUpload(&repo_config, [&] {
         return BazelApi::Ptr{new BazelApi{"remote-execution",
                                           remote_config->remote_address->host,
                                           remote_config->remote_address->port,
                                           &*auth_config,
                                           &retry_config,
-                                          config}};
+                                          config,
+                                          hash_function}};
     });
 }
 
@@ -65,6 +72,10 @@ TEST_CASE("Executor<BazelApi>: Compile hello world", "[executor]") {
 
     RetryConfig retry_config{};  // default retry config
 
+    HashFunction const hash_function{Compatibility::IsCompatible()
+                                         ? HashFunction::JustHash::Compatible
+                                         : HashFunction::JustHash::Native};
+
     TestHelloWorldCompilation(
         &repo_config,
         &stats,
@@ -76,7 +87,8 @@ TEST_CASE("Executor<BazelApi>: Compile hello world", "[executor]") {
                              remote_config->remote_address->port,
                              &*auth_config,
                              &retry_config,
-                             config}};
+                             config,
+                             hash_function}};
         },
         &*auth_config,
         false /* not hermetic */);
@@ -98,6 +110,10 @@ TEST_CASE("Executor<BazelApi>: Compile greeter", "[executor]") {
 
     RetryConfig retry_config{};  // default retry config
 
+    HashFunction const hash_function{Compatibility::IsCompatible()
+                                         ? HashFunction::JustHash::Compatible
+                                         : HashFunction::JustHash::Native};
+
     TestGreeterCompilation(
         &repo_config,
         &stats,
@@ -109,7 +125,8 @@ TEST_CASE("Executor<BazelApi>: Compile greeter", "[executor]") {
                              remote_config->remote_address->port,
                              &*auth_config,
                              &retry_config,
-                             config}};
+                             config,
+                             hash_function}};
         },
         &*auth_config,
         false /* not hermetic */);
@@ -131,6 +148,10 @@ TEST_CASE("Executor<BazelApi>: Upload and download trees", "[executor]") {
 
     RetryConfig retry_config{};  // default retry config
 
+    HashFunction const hash_function{Compatibility::IsCompatible()
+                                         ? HashFunction::JustHash::Compatible
+                                         : HashFunction::JustHash::Native};
+
     TestUploadAndDownloadTrees(
         &repo_config,
         &stats,
@@ -142,7 +163,8 @@ TEST_CASE("Executor<BazelApi>: Upload and download trees", "[executor]") {
                              remote_config->remote_address->port,
                              &*auth_config,
                              &retry_config,
-                             config}};
+                             config,
+                             hash_function}};
         },
         &*auth_config,
         false /* not hermetic */);
@@ -164,6 +186,10 @@ TEST_CASE("Executor<BazelApi>: Retrieve output directories", "[executor]") {
 
     RetryConfig retry_config{};  // default retry config
 
+    HashFunction const hash_function{Compatibility::IsCompatible()
+                                         ? HashFunction::JustHash::Compatible
+                                         : HashFunction::JustHash::Native};
+
     TestRetrieveOutputDirectories(
         &repo_config,
         &stats,
@@ -175,7 +201,8 @@ TEST_CASE("Executor<BazelApi>: Retrieve output directories", "[executor]") {
                              remote_config->remote_address->port,
                              &*auth_config,
                              &retry_config,
-                             config}};
+                             config,
+                             hash_function}};
         },
         &*auth_config,
         false /* not hermetic */);
-- 
cgit v1.2.3