diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | test/end-to-end/TARGETS | 41 |
2 files changed, 14 insertions, 28 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e9d1166..74a5450c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ Bug fixes on top of release `1.2.4`. if not called `just`. - Taintedness of "configure" targets is now propagated correctly. - Missing atomic primitives added to the source code. +- A staging conflict in the test setup was fixed. ## Release `1.2.4` (2023-12-19) diff --git a/test/end-to-end/TARGETS b/test/end-to-end/TARGETS index bfb14dfc..cd254cb7 100644 --- a/test/end-to-end/TARGETS +++ b/test/end-to-end/TARGETS @@ -1,39 +1,24 @@ { "tool-under-test": - { "type": "generic" - , "cmds": ["mkdir -p bin lib", "mv bin/just bin/tool-under-test"] - , "outs": ["bin/tool-under-test"] - , "out_dirs": ["lib"] - , "deps": [["@", "src", "", "installed just"]] + { "type": "install" + , "dirs": [[["@", "src", "", "installed just"], "."]] + , "files": {"bin/tool-under-test": ["@", "src", "", "just"]} } , "mr-tool-under-test": - { "type": "generic" + { "type": "install" , "arguments_config": ["TEST_BOOTSTRAP_JUST_MR"] - , "cmds": - [ "mkdir -p bin lib" - , { "type": "join_cmd" - , "$1": - [ "mv" - , { "type": "if" - , "cond": {"type": "var", "name": "TEST_BOOTSTRAP_JUST_MR"} - , "then": "bin/just-mr.py" - , "else": "bin/just-mr" - } - , "bin/mr-tool-under-test" - ] - } - ] - , "outs": ["bin/mr-tool-under-test"] - , "out_dirs": + , "dirs": { "type": "if" , "cond": {"type": "var", "name": "TEST_BOOTSTRAP_JUST_MR"} , "then": [] - , "else": ["lib"] + , "else": [[["@", "src", "", "installed just-mr"], "."]] } - , "deps": - { "type": "if" - , "cond": {"type": "var", "name": "TEST_BOOTSTRAP_JUST_MR"} - , "then": [["@", "src", "", "bin/just-mr.py"]] - , "else": [["@", "src", "", "installed just-mr"]] + , "files": + { "bin/mr-tool-under-test": + { "type": "if" + , "cond": {"type": "var", "name": "TEST_BOOTSTRAP_JUST_MR"} + , "then": ["@", "src", "", "bin/just-mr.py"] + , "else": ["@", "src", "", "just-mr"] + } } } , "git-import-under-test": |