summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorOliver Reiche <oliver.reiche@huawei.com>2024-12-16 13:39:36 +0100
committerOliver Reiche <oliver.reiche@huawei.com>2024-12-19 16:17:46 +0100
commite2b6d9d3c41d162517019ee0bf9147e398a5b1fa (patch)
tree248f0a50ec1183836a8257580779cac79ccf51f5 /test
parent827f05a53cb831bd54166ee812752ae3cce2b69b (diff)
downloadjustbuild-e2b6d9d3c41d162517019ee0bf9147e398a5b1fa.tar.gz
Fix cause of minor warnings
Diffstat (limited to 'test')
-rw-r--r--test/buildtool/build_engine/expression/expression.test.cpp1
-rw-r--r--test/buildtool/file_system/resolve_symlinks_map.test.cpp4
-rw-r--r--test/buildtool/graph_traverser/graph_traverser.test.hpp46
-rw-r--r--test/utils/large_objects/large_object_utils.cpp4
4 files changed, 31 insertions, 24 deletions
diff --git a/test/buildtool/build_engine/expression/expression.test.cpp b/test/buildtool/build_engine/expression/expression.test.cpp
index 02de11fa..6ba9bf0b 100644
--- a/test/buildtool/build_engine/expression/expression.test.cpp
+++ b/test/buildtool/build_engine/expression/expression.test.cpp
@@ -1836,7 +1836,6 @@ TEST_CASE("Expression hash computation", "[expression]") {
using namespace std::string_literals;
using path = std::filesystem::path;
using number_t = Expression::number_t;
- using artifact_t = Expression::artifact_t;
using result_t = Expression::result_t;
using list_t = Expression::list_t;
using map_t = Expression::map_t;
diff --git a/test/buildtool/file_system/resolve_symlinks_map.test.cpp b/test/buildtool/file_system/resolve_symlinks_map.test.cpp
index 729e3c54..c6e69f65 100644
--- a/test/buildtool/file_system/resolve_symlinks_map.test.cpp
+++ b/test/buildtool/file_system/resolve_symlinks_map.test.cpp
@@ -151,7 +151,7 @@ TEST_CASE("Resolve symlinks", "[resolve_symlinks_map]") {
source_cas,
source_cas)},
[&expected, &source_cas](auto const& values) {
- for (auto i = 0; i < kNumCases; ++i) {
+ for (std::size_t i = 0; i < kNumCases; ++i) {
auto const& res = ResolvedGitObject{*values[i]};
CHECK(res.id == expected[i].id);
CHECK(res.type == expected[i].type);
@@ -207,7 +207,7 @@ TEST_CASE("Resolve symlinks", "[resolve_symlinks_map]") {
source_cas,
target_cas)},
[&expected, &target_cas](auto const& values) {
- for (auto i = 0; i < kNumCases; ++i) {
+ for (std::size_t i = 0; i < kNumCases; ++i) {
auto const& res = ResolvedGitObject{*values[i]};
CHECK(res.id == expected[i].id);
CHECK(res.type == expected[i].type);
diff --git a/test/buildtool/graph_traverser/graph_traverser.test.hpp b/test/buildtool/graph_traverser/graph_traverser.test.hpp
index db2e87ac..b3340ab9 100644
--- a/test/buildtool/graph_traverser/graph_traverser.test.hpp
+++ b/test/buildtool/graph_traverser/graph_traverser.test.hpp
@@ -204,7 +204,7 @@ class TestProject {
.progress = &progress};
GraphTraverser const gt{
- clargs.gtargs, &exec_context, [](auto done, auto cv) {}};
+ clargs.gtargs, &exec_context, [](auto /*done*/, auto /*cv*/) {}};
auto const result =
gt.BuildAndStage(clargs.graph_description, clargs.artifacts);
@@ -223,8 +223,9 @@ class TestProject {
SECTION("Executable is retrieved as executable") {
auto const clargs_exec = p.CmdLineArgs("_entry_points_get_executable");
- GraphTraverser const gt_get_exec{
- clargs_exec.gtargs, &exec_context, [](auto done, auto cv) {}};
+ GraphTraverser const gt_get_exec{clargs_exec.gtargs,
+ &exec_context,
+ [](auto /*done*/, auto /*cv*/) {}};
auto const exec_result = gt_get_exec.BuildAndStage(
clargs_exec.graph_description, clargs_exec.artifacts);
@@ -279,7 +280,7 @@ class TestProject {
.progress = &progress};
GraphTraverser const gt{
- clargs.gtargs, &exec_context, [](auto done, auto cv) {}};
+ clargs.gtargs, &exec_context, [](auto /*done*/, auto /*cv*/) {}};
auto const result =
gt.BuildAndStage(clargs.graph_description, clargs.artifacts);
@@ -329,7 +330,7 @@ class TestProject {
.progress = &progress};
GraphTraverser const gt{
- clargs.gtargs, &exec_context, [](auto done, auto cv) {}};
+ clargs.gtargs, &exec_context, [](auto /*done*/, auto /*cv*/) {}};
auto const result =
gt.BuildAndStage(clargs.graph_description, clargs.artifacts);
@@ -338,8 +339,9 @@ class TestProject {
CHECK(FileSystemManager::IsFile(result->output_paths.at(0)));
auto const clargs_full_build = p.CmdLineArgs("_entry_points_full_build");
- GraphTraverser const gt_full_build{
- clargs_full_build.gtargs, &exec_context, [](auto done, auto cv) {}};
+ GraphTraverser const gt_full_build{clargs_full_build.gtargs,
+ &exec_context,
+ [](auto /*done*/, auto /*cv*/) {}};
auto const full_build_result = gt_full_build.BuildAndStage(
clargs_full_build.graph_description, clargs_full_build.artifacts);
@@ -393,8 +395,9 @@ class TestProject {
.statistics = &stats,
.progress = &progress};
- GraphTraverser const gt_upload{
- clargs_update_cpp.gtargs, &full_context, [](auto done, auto cv) {}};
+ GraphTraverser const gt_upload{clargs_update_cpp.gtargs,
+ &full_context,
+ [](auto /*done*/, auto /*cv*/) {}};
auto const cpp_result = gt_upload.BuildAndStage(
clargs_update_cpp.graph_description, clargs_update_cpp.artifacts);
@@ -421,7 +424,7 @@ class TestProject {
.statistics = &stats,
.progress = &progress};
GraphTraverser const gt{
- clargs.gtargs, &context_known, [](auto done, auto cv) {}};
+ clargs.gtargs, &context_known, [](auto /*done*/, auto /*cv*/) {}};
auto const result =
gt.BuildAndStage(clargs.graph_description, clargs.artifacts);
@@ -473,7 +476,8 @@ static void TestBlobsUploadedAndUsed(
.statistics = &stats,
.progress = &progress};
- GraphTraverser gt{clargs.gtargs, &exec_context, [](auto done, auto cv) {}};
+ GraphTraverser gt{
+ clargs.gtargs, &exec_context, [](auto /*done*/, auto /*cv*/) {}};
auto const result =
gt.BuildAndStage(clargs.graph_description, clargs.artifacts);
@@ -530,7 +534,8 @@ static void TestEnvironmentVariablesSetAndUsed(
.statistics = &stats,
.progress = &progress};
- GraphTraverser gt{clargs.gtargs, &exec_context, [](auto done, auto cv) {}};
+ GraphTraverser gt{
+ clargs.gtargs, &exec_context, [](auto /*done*/, auto /*cv*/) {}};
auto const result =
gt.BuildAndStage(clargs.graph_description, clargs.artifacts);
@@ -587,7 +592,8 @@ static void TestTreesUsed(
.statistics = &stats,
.progress = &progress};
- GraphTraverser gt{clargs.gtargs, &exec_context, [](auto done, auto cv) {}};
+ GraphTraverser gt{
+ clargs.gtargs, &exec_context, [](auto /*done*/, auto /*cv*/) {}};
auto const result =
gt.BuildAndStage(clargs.graph_description, clargs.artifacts);
@@ -644,7 +650,8 @@ static void TestNestedTreesUsed(
.statistics = &stats,
.progress = &progress};
- GraphTraverser gt{clargs.gtargs, &exec_context, [](auto done, auto cv) {}};
+ GraphTraverser gt{
+ clargs.gtargs, &exec_context, [](auto /*done*/, auto /*cv*/) {}};
auto const result =
gt.BuildAndStage(clargs.graph_description, clargs.artifacts);
@@ -703,7 +710,7 @@ static void TestFlakyHelloWorldDetected(
{
auto clargs = p.CmdLineArgs("_entry_points_ctimes");
GraphTraverser const gt{
- clargs.gtargs, &exec_context, [](auto done, auto cv) {}};
+ clargs.gtargs, &exec_context, [](auto /*done*/, auto /*cv*/) {}};
auto const result =
gt.BuildAndStage(clargs.graph_description, clargs.artifacts);
@@ -718,7 +725,7 @@ static void TestFlakyHelloWorldDetected(
auto clargs_output = p.CmdLineArgs();
clargs_output.gtargs.rebuild = RebuildArguments{};
GraphTraverser const gt_output{
- clargs_output.gtargs, &exec_context, [](auto done, auto cv) {}};
+ clargs_output.gtargs, &exec_context, [](auto /*done*/, auto /*cv*/) {}};
REQUIRE(gt_output.BuildAndStage(clargs_output.graph_description,
clargs_output.artifacts));
CHECK(stats.ActionsFlakyCounter() == 1);
@@ -729,8 +736,9 @@ static void TestFlakyHelloWorldDetected(
// make_exe[flaky]->make_output[miss]->strip_time [miss]
auto clargs_stripped = p.CmdLineArgs("_entry_points_stripped");
clargs_stripped.gtargs.rebuild = RebuildArguments{};
- GraphTraverser const gt_stripped{
- clargs_stripped.gtargs, &exec_context, [](auto done, auto cv) {}};
+ GraphTraverser const gt_stripped{clargs_stripped.gtargs,
+ &exec_context,
+ [](auto /*done*/, auto /*cv*/) {}};
REQUIRE(gt_stripped.BuildAndStage(clargs_stripped.graph_description,
clargs_stripped.artifacts));
CHECK(stats.ActionsFlakyCounter() == 1);
@@ -742,7 +750,7 @@ static void TestFlakyHelloWorldDetected(
auto clargs_ctimes = p.CmdLineArgs("_entry_points_ctimes");
clargs_ctimes.gtargs.rebuild = RebuildArguments{};
GraphTraverser const gt_ctimes{
- clargs_ctimes.gtargs, &exec_context, [](auto done, auto cv) {}};
+ clargs_ctimes.gtargs, &exec_context, [](auto /*done*/, auto /*cv*/) {}};
REQUIRE(gt_ctimes.BuildAndStage(clargs_ctimes.graph_description,
clargs_ctimes.artifacts));
CHECK(stats.ActionsFlakyCounter() == 2);
diff --git a/test/utils/large_objects/large_object_utils.cpp b/test/utils/large_objects/large_object_utils.cpp
index b61ea49e..0afa7d6f 100644
--- a/test/utils/large_objects/large_object_utils.cpp
+++ b/test/utils/large_objects/large_object_utils.cpp
@@ -55,7 +55,7 @@ class ChunkPool final {
[[nodiscard]] auto operator[](std::size_t index) const noexcept
-> std::string const& {
- return gsl::at(pool_, index);
+ return gsl::at(pool_, gsl::narrow<gsl::index>(index));
}
private:
@@ -66,7 +66,7 @@ class ChunkPool final {
Randomizer randomizer{1, std::numeric_limits<char>::max()};
for (std::size_t i = 0; i < pool_.size(); ++i) {
- auto& chunk = gsl::at(pool_, i);
+ auto& chunk = gsl::at(pool_, gsl::narrow<gsl::index>(i));
chunk.resize(kChunkLength);
for (std::size_t j = 0; j < kChunkLength; ++j) {
chunk[j] = randomizer.Get();