From a73f6ca9cafb768f3132cfcef8c826af34eeff94 Mon Sep 17 00:00:00 2001 From: Teodor Nikolov Date: Mon, 31 Jan 2022 13:29:25 +0000 Subject: [PATCH] Squash a minor warning --- CONTRIBUTORS.md | 1 + src/runtime/test/test_OCIBundleConfig.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 455b0b6a..554c15d6 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -7,4 +7,5 @@ - Madonna, Alberto. ETH Zurich - CSCS - Manitaras, Theofilos. ETH Zurich - CSCS - Mariotti, Kean. ETH Zurich - CSCS +- Nikolov, Teodor. ETH Zurich - CSCS - Piccinali, Jean-Guillaume. ETH Zurich - CSCS diff --git a/src/runtime/test/test_OCIBundleConfig.cpp b/src/runtime/test/test_OCIBundleConfig.cpp index 2919ebca..4e4a48cb 100644 --- a/src/runtime/test/test_OCIBundleConfig.cpp +++ b/src/runtime/test/test_OCIBundleConfig.cpp @@ -118,12 +118,12 @@ static void checkExistenceAndPermissions(const boost::filesystem::path& file) { } /** -/* Sort environment arrays in both JSON objects to avoid test failures due to how the elements -/* are ordered in the Sarus-generated JSON: inside Sarus the container environment is stored -/* as an unordered map, so the order of the elements when converted to a linear JSON array -/* is compiler-dependent. -/* The sorting does not compromise the test since what is important here is if the individual -/* elements are all there and they match, not which order they are in. + * Sort environment arrays in both JSON objects to avoid test failures due to how the elements + * are ordered in the Sarus-generated JSON: inside Sarus the container environment is stored + * as an unordered map, so the order of the elements when converted to a linear JSON array + * is compiler-dependent. + * The sorting does not compromise the test since what is important here is if the individual + * elements are all there and they match, not which order they are in. */ static void sortJsonEnvironmentArray(rj::Document& json) { auto rjStringCompare = [](const rapidjson::Value& lhs, const rapidjson::Value& rhs) {