Skip to content

Commit

Permalink
Squash a minor warning
Browse files Browse the repository at this point in the history
  • Loading branch information
Teodor Nikolov committed Jan 31, 2022
1 parent a9e54e4 commit a73f6ca
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 6 additions & 6 deletions src/runtime/test/test_OCIBundleConfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit a73f6ca

Please sign in to comment.