diff options
author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2023-08-17 12:42:55 +0200 |
---|---|---|
committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2023-08-17 14:08:39 +0200 |
commit | 44c0b156254e11f4c1a1bf66a6cf790a5779d774 (patch) | |
tree | e05453871e926803ac33bb6e17d38d0f6967a79c | |
parent | 56a63969e9f397395976ffa62a0eec14df2d05ff (diff) | |
download | justbuild-44c0b156254e11f4c1a1bf66a6cf790a5779d774.tar.gz |
["shell/test", "script"] Rename implicit dependencies
... and document at the appropriate places what can be overwritten
by setting those targets.
-rw-r--r-- | rules/CC/test/RULES | 5 | ||||
-rw-r--r-- | rules/shell/test/RULES | 14 | ||||
-rwxr-xr-x | rules/shell/test/runner (renamed from rules/shell/test/test_runner.sh) | 0 | ||||
-rwxr-xr-x | rules/shell/test/summarizer (renamed from rules/shell/test/test_summary.py) | 0 | ||||
-rw-r--r-- | test/end-to-end/RULES | 2 |
5 files changed, 17 insertions, 4 deletions
diff --git a/rules/CC/test/RULES b/rules/CC/test/RULES index 8dba3630..41507d7e 100644 --- a/rules/CC/test/RULES +++ b/rules/CC/test/RULES @@ -30,7 +30,7 @@ , "implicit": { "defaults": [["./", "..", "defaults"]] , "runner": ["test_runner.py"] - , "summarizer": [["./", "../../shell/test", "test_summary.py"]] + , "summarizer": [["./", "../../shell/test", "summarizer"]] } , "field_doc": { "name": @@ -88,6 +88,9 @@ , "RUNS_PER_TEST": [ "The number of times the test should be run in order to detect flakyness." , "If set, no test action will be taken from cache." + , "" + , "Test runs are summarized by the [\"shell/test\", \"summarizer\"] that" + , "is also used by shell tests." ] , "TARGET_ARCH": [ "The architecture to build the test for." diff --git a/rules/shell/test/RULES b/rules/shell/test/RULES index 117a060d..c4f85695 100644 --- a/rules/shell/test/RULES +++ b/rules/shell/test/RULES @@ -20,6 +20,11 @@ , "TEST_TMPDIR. The test should not assume write permissions" , "outside the working directory and the TEST_TMPDIR." , "For convenience, the environment variable TMPDIR is also set to TEST_TMPDIR." + , "" + , "This running of the test is carried out by the implicit dependency" + , "on the target \"runner\". By setting this target in the target layer" + , "of this rues repository (instead of letting it default to the" + , "respective file), the shell test environment can be modified globally." ] , "name": [ "A name for the test, used in reporting, as well as for staging" @@ -39,6 +44,12 @@ { "RUNS_PER_TEST": [ "The number of times the test should be run in order to detect flakyness." , "If set, no test action will be taken from cache." + , "" + , "The individual test runs will be summarized by the implict dependency" + , "on the target \"summarizer\". By setting this target in the target" + , "in the target layer of this rues repository (instead of letting it" + , "default to the respective file) the layout of the summary can be" + , "changed globally." ] , "TEST_ENV": ["The environment for executing the test runner."] , "TIMEOUT_SCALE": @@ -72,8 +83,7 @@ , "As the built-in \"install\" rule only takes the runfiles of its \"deps\"" , "argument, this gives an easy way of defining test suites." ] - , "implicit": - {"runner": ["test_runner.sh"], "summarizer": ["test_summary.py"]} + , "implicit": {"runner": ["runner"], "summarizer": ["summarizer"]} , "imports": { "test-result": "test-result" , "action": "test-action" diff --git a/rules/shell/test/test_runner.sh b/rules/shell/test/runner index a99d5b77..a99d5b77 100755 --- a/rules/shell/test/test_runner.sh +++ b/rules/shell/test/runner diff --git a/rules/shell/test/test_summary.py b/rules/shell/test/summarizer index 0b5e656e..0b5e656e 100755 --- a/rules/shell/test/test_summary.py +++ b/rules/shell/test/summarizer diff --git a/test/end-to-end/RULES b/test/end-to-end/RULES index b94b8f8f..aef5a668 100644 --- a/test/end-to-end/RULES +++ b/test/end-to-end/RULES @@ -70,7 +70,7 @@ ] , "implicit": { "runner": ["with_remote_test_runner.py"] - , "summarizer": [["@", "rules", "shell/test", "test_summary.py"]] + , "summarizer": [["@", "rules", "shell/test", "summarizer"]] , "just": [["@", "src", "", "installed just"]] } , "imports": |