diff options
| -rw-r--r-- | CONTRIBUTING.md | 14 | ||||
| -rw-r--r-- | test/TARGETS | 34 |
2 files changed, 28 insertions, 20 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e423ca02..838c8fd5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,14 +9,12 @@ carefully discuss the objective of the planned feature, possible alternatives, as well as the transition plan. This document has to be agreed upon and committed to the repository first. -For all changes, remember to also update the documentation and -add appropriate test coverage. For code to be accepted, all tests -must pass; the two global test suites are `["@", "just tests", "", "ALL"]` -and `["@", "just tests", "test", "bootstrap-test"]` where the -latter needs an increased action time out. Code is formatted with -`clang-format` and linted with `clang-tidy`; the corresponding -configuration files can be found in the top-level directory of -this repository. +For all changes, remember to also update the documentation and add +appropriate test coverage. For code to be accepted, all tests must +pass; the global test suite is `["@", "just tests", "", "ALL"]`. +Code is formatted with `clang-format` and linted with `clang-tidy`; +the corresponding configuration files can be found in the top-level +directory of this repository. Changes should be organized as a patch series, i.e., as a sequence of small changes that are easy to review, but nevertheless self-contained diff --git a/test/TARGETS b/test/TARGETS index 92838f66..8f6ccf66 100644 --- a/test/TARGETS +++ b/test/TARGETS @@ -11,13 +11,23 @@ } , "TESTS": { "type": "install" + , "arguments_config": ["DROP_LARGE_TESTS"] , "tainted": ["test"] , "dirs": - [ [["./", "buildtool", "TESTS"], "buildtool"] - , [["./", "utils", "TESTS"], "utils"] - , [["./", "end-to-end", "TESTS"], "end-to-end"] - , [["./", "other_tools", "TESTS"], "other_tools"] - ] + { "type": "++" + , "$1": + [ [ [["./", "buildtool", "TESTS"], "buildtool"] + , [["./", "utils", "TESTS"], "utils"] + , [["./", "end-to-end", "TESTS"], "end-to-end"] + , [["./", "other_tools", "TESTS"], "other_tools"] + ] + , { "type": "if" + , "cond": {"type": "var", "name": "DROP_LARGE_TESTS"} + , "then": [] + , "else": [["bootstrap-test", "bootstrap"]] + } + ] + } } , "ALL": { "type": "configure" @@ -66,14 +76,14 @@ } } , "bootstrap-test": - { "type": "install" - , "tainted": ["test"] - , "deps": [["./", "bootstrap", "TESTS"]] - } -, "large-tests": - { "type": "install" + { "type": "configure" , "tainted": ["test"] - , "dirs": [["bootstrap-test", "bootstrap-test"]] + , "target": ["./", "bootstrap", "TESTS"] + , "config": + { "type": "let*" + , "bindings": [["TIMEOUT_SCALE", 20.0]] + , "body": {"type": "env", "vars": ["TIMEOUT_SCALE"]} + } } , "test-deps-headers": { "type": ["@", "rules", "CC", "install-with-deps"] |