diff options
| -rw-r--r-- | src/other_tools/just_mr/rc_merge.cpp | 3 | ||||
| -rw-r--r-- | test/other_tools/just_mr/rc_merge.test.cpp | 14 |
2 files changed, 14 insertions, 3 deletions
diff --git a/src/other_tools/just_mr/rc_merge.cpp b/src/other_tools/just_mr/rc_merge.cpp index dfd90b54..173b8a9e 100644 --- a/src/other_tools/just_mr/rc_merge.cpp +++ b/src/other_tools/just_mr/rc_merge.cpp @@ -25,7 +25,8 @@ namespace { auto const kAccumulating = std::vector<std::string>{"distdirs"}; -auto const kLocalMerge = std::vector<std::string>{"just args", "just files"}; +auto const kLocalMerge = + std::vector<std::string>{"just args", "just files", "invocation log"}; } // namespace diff --git a/test/other_tools/just_mr/rc_merge.test.cpp b/test/other_tools/just_mr/rc_merge.test.cpp index 0f1c62f9..9be58ca0 100644 --- a/test/other_tools/just_mr/rc_merge.test.cpp +++ b/test/other_tools/just_mr/rc_merge.test.cpp @@ -54,10 +54,15 @@ TEST_CASE("accumulating") { TEST_CASE("local-merge") { auto conf = Configuration{Expression::FromJson(R"( - {"just args": {"build": ["-J", "8"], "install": ["-J", "8", "--remember"]}} + {"just args": {"build": ["-J", "8"], "install": ["-J", "8", "--remember"]} + ,"invocation log": {"directory": {"root": "system" + , "path": "/var/log/just-mr"}} + } )"_json)}; auto delta = Configuration{Expression::FromJson(R"( - {"just args": {"build": ["-J", "128"], "install-cas": ["--remember"]}} + {"just args": {"build": ["-J", "128"], "install-cas": ["--remember"]} + ,"invocation log": {"project id": "unicorn"} + } )"_json)}; auto merged = MergeMRRC(conf, delta); @@ -67,4 +72,9 @@ TEST_CASE("local-merge") { , "install": ["-J", "8", "--remember"] } )"_json)); + CHECK(merged["invocation log"] == Expression::FromJson(R"( + { "directory":{"root": "system" , "path": "/var/log/just-mr"} + , "project id": "unicorn" + } + )"_json)); } |