diff options
| author | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2023-01-10 09:55:16 +0100 |
|---|---|---|
| committer | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2023-01-10 10:38:38 +0100 |
| commit | e98893681f9a1d534a88401c00d8fda845e667ea (patch) | |
| tree | 2d18556e409fe65685b216adb12dada82d70311c | |
| parent | b95cd9ee451ff26295d099a8a31340b99b8f0558 (diff) | |
| download | justbuild-e98893681f9a1d534a88401c00d8fda845e667ea.tar.gz | |
Tests: Add TEST_BOOTSTRAP_JUST_MR config var to decide which just-mr is used in the end-to-end tests
| -rw-r--r-- | test/TARGETS | 17 | ||||
| -rw-r--r-- | test/end-to-end/TARGETS | 10 |
2 files changed, 24 insertions, 3 deletions
diff --git a/test/TARGETS b/test/TARGETS index d178a3fb..9e9c20eb 100644 --- a/test/TARGETS +++ b/test/TARGETS @@ -18,7 +18,13 @@ , "ALL": { "type": "configure" , "arguments_config": - ["OS", "ARCH", "HOST_ARCH", "TARGET_ARCH", "COMPILER_FAMILY"] + [ "OS" + , "ARCH" + , "HOST_ARCH" + , "TARGET_ARCH" + , "COMPILER_FAMILY" + , "TEST_BOOTSTRAP_JUST_MR" + ] , "tainted": ["test"] , "target": "TESTS" , "config": @@ -44,7 +50,14 @@ ] , "body": { "type": "env" - , "vars": ["OS", "ARCH", "HOST_ARCH", "TARGET_ARCH", "COMPILER_FAMILY"] + , "vars": + [ "OS" + , "ARCH" + , "HOST_ARCH" + , "TARGET_ARCH" + , "COMPILER_FAMILY" + , "TEST_BOOTSTRAP_JUST_MR" + ] } } } diff --git a/test/end-to-end/TARGETS b/test/end-to-end/TARGETS index 27a8c755..040fee64 100644 --- a/test/end-to-end/TARGETS +++ b/test/end-to-end/TARGETS @@ -2,7 +2,15 @@ {"type": "install", "files": {"bin/tool-under-test": [".", "just"]}} , "mr-tool-under-test": { "type": "install" - , "files": {"bin/mr-tool-under-test": ["", "bin/just-mr.py"]} + , "arguments_config": ["TEST_BOOTSTRAP_JUST_MR"] + , "files": + { "bin/mr-tool-under-test": + { "type": "if" + , "cond": {"type": "var", "name": "TEST_BOOTSTRAP_JUST_MR"} + , "then": ["", "bin/just-mr.py"] + , "else": [".", "just-mr"] + } + } } , "TESTS": { "type": "install" |