diff options
Diffstat (limited to 'test/buildtool/execution_engine/traverser')
-rw-r--r-- | test/buildtool/execution_engine/traverser/TARGETS | 2 | ||||
-rw-r--r-- | test/buildtool/execution_engine/traverser/traverser.test.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/test/buildtool/execution_engine/traverser/TARGETS b/test/buildtool/execution_engine/traverser/TARGETS index 7228b0af..72a7abea 100644 --- a/test/buildtool/execution_engine/traverser/TARGETS +++ b/test/buildtool/execution_engine/traverser/TARGETS @@ -7,11 +7,11 @@ , ["", "catch-main"] , ["utils", "container_matchers"] , ["@", "src", "src/buildtool/common", "common"] - , ["@", "src", "src/buildtool/common", "protocol_traits"] , ["@", "src", "src/buildtool/common", "artifact_description"] , ["@", "src", "src/buildtool/execution_engine/dag", "dag"] , ["@", "src", "src/buildtool/execution_engine/traverser", "traverser"] , ["@", "src", "src/buildtool/crypto", "hash_function"] + , ["utils", "test_hash_function_type"] ] , "stage": ["test", "buildtool", "execution_engine", "traverser"] } diff --git a/test/buildtool/execution_engine/traverser/traverser.test.cpp b/test/buildtool/execution_engine/traverser/traverser.test.cpp index 7b2e6293..cc5c22e9 100644 --- a/test/buildtool/execution_engine/traverser/traverser.test.cpp +++ b/test/buildtool/execution_engine/traverser/traverser.test.cpp @@ -24,10 +24,10 @@ #include "catch2/catch_test_macros.hpp" #include "src/buildtool/common/artifact_description.hpp" -#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_engine/dag/dag.hpp" #include "test/utils/container_matchers.hpp" +#include "test/utils/hermeticity/test_hash_function_type.hpp" namespace { @@ -184,9 +184,7 @@ class TestProject { auto inputs_desc = ActionDescription::inputs_t{}; if (not inputs.empty()) { command.emplace_back("FROM"); - auto const hash_type = ProtocolTraits::Instance().IsCompatible() - ? HashFunction::Type::PlainSHA256 - : HashFunction::Type::GitSHA1; + auto const hash_type = TestHashType::ReadFromEnvironment(); for (auto const& input_desc : inputs) { auto artifact = ArtifactDescription::FromJson(hash_type, input_desc); |