diff options
author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-07-11 13:22:16 +0200 |
---|---|---|
committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-07-12 15:43:37 +0200 |
commit | 1e1758e8c30d30df0ebeefbada1e5a8f74d8a350 (patch) | |
tree | b5b87ab3d7b61a0dc0e89e14e28af78293c4a423 /test/buildtool/execution_engine/dag/dag.test.cpp | |
parent | 9362f6c426a6e10d0f77282364a0061ebf192375 (diff) | |
download | justbuild-1e1758e8c30d30df0ebeefbada1e5a8f74d8a350.tar.gz |
Use static Create functions to construct ArtifactDescription
...instead of unobvious ctors relying on overload resolution.
Diffstat (limited to 'test/buildtool/execution_engine/dag/dag.test.cpp')
-rw-r--r-- | test/buildtool/execution_engine/dag/dag.test.cpp | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/test/buildtool/execution_engine/dag/dag.test.cpp b/test/buildtool/execution_engine/dag/dag.test.cpp index 508c954e..cac4b791 100644 --- a/test/buildtool/execution_engine/dag/dag.test.cpp +++ b/test/buildtool/execution_engine/dag/dag.test.cpp @@ -130,7 +130,8 @@ TEST_CASE("AddAction({single action, more outputs, no inputs})", "[dag]") { TEST_CASE("AddAction({single action, single output, source file})", "[dag]") { using path = std::filesystem::path; std::string const action_id = "action_id"; - auto const src_description = ArtifactDescription{path{"main.cpp"}, "repo"}; + auto const src_description = + ArtifactDescription::CreateLocal(path{"main.cpp"}, "repo"); auto const& src_id = src_description.Id(); DependencyGraph g; SECTION("Input file in the same path than it is locally") { @@ -205,13 +206,17 @@ TEST_CASE("Add executable and library", "[dag]") { std::string const make_lib_id = "make_lib"; std::vector<std::string> const make_exec_cmd = {"build", "exec"}; std::vector<std::string> const make_lib_cmd = {"build", "lib.a"}; - auto const main_desc = ArtifactDescription{path{"main.cpp"}, ""}; + auto const main_desc = + ArtifactDescription::CreateLocal(path{"main.cpp"}, ""); auto const& main_id = main_desc.Id(); - auto const lib_hpp_desc = ArtifactDescription{path{"lib/lib.hpp"}, ""}; + auto const lib_hpp_desc = + ArtifactDescription::CreateLocal(path{"lib/lib.hpp"}, ""); auto const& lib_hpp_id = lib_hpp_desc.Id(); - auto const lib_cpp_desc = ArtifactDescription{path{"lib/lib.cpp"}, ""}; + auto const lib_cpp_desc = + ArtifactDescription::CreateLocal(path{"lib/lib.cpp"}, ""); auto const& lib_cpp_id = lib_cpp_desc.Id(); - auto const lib_a_desc = ArtifactDescription{make_lib_id, "lib.a"}; + auto const lib_a_desc = + ArtifactDescription::CreateAction(make_lib_id, "lib.a"); auto const& lib_a_id = lib_a_desc.Id(); auto const make_exec_desc = @@ -219,7 +224,8 @@ TEST_CASE("Add executable and library", "[dag]") { {}, Action{make_exec_id, make_exec_cmd, {}}, {{"main.cpp", main_desc}, {"lib.a", lib_a_desc}}}; - auto const& exec_out_id = ArtifactDescription{make_exec_id, "exec"}.Id(); + auto const& exec_out_id = + ArtifactDescription::CreateAction(make_exec_id, "exec").Id(); auto const make_lib_desc = ActionDescription{ {"lib.a"}, @@ -293,8 +299,10 @@ TEST_CASE("AddAction(Empty mandatory non-empty field in action description)", TEST_CASE("Adding cyclic dependencies produces invalid graph", "[dag]") { std::string const action1_id = "action1"; std::string const action2_id = "action2"; - auto const out1_desc = ArtifactDescription(action1_id, "out1"); - auto const out2_desc = ArtifactDescription(action2_id, "out2"); + auto const out1_desc = + ArtifactDescription::CreateAction(action1_id, "out1"); + auto const out2_desc = + ArtifactDescription::CreateAction(action2_id, "out2"); auto const action1_desc = ActionDescription{{"out1"}, |