diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2023-05-31 14:34:28 +0200 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2023-05-31 14:34:28 +0200 |
| commit | 9c1b7cfe4c118389beb5e386e71f7784e743a4a1 (patch) | |
| tree | f9793ab6b0a416357d3c51e9095e6be5b743d461 | |
| parent | 3207a8c0b15d80e77e3addc98fc3d23027bb298b (diff) | |
| parent | 970956cf14026dcc863befe38a9331a8065b91b3 (diff) | |
| download | rules-cc-9c1b7cfe4c118389beb5e386e71f7784e743a4a1.tar.gz | |
Merge commit '970956cf14026dcc863befe38a9331a8065b91b3' into HEAD
| -rw-r--r-- | shell/test/EXPRESSIONS | 6 | ||||
| -rw-r--r-- | shell/test/RULES | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/shell/test/EXPRESSIONS b/shell/test/EXPRESSIONS index ea36b32..a1e3137 100644 --- a/shell/test/EXPRESSIONS +++ b/shell/test/EXPRESSIONS @@ -1,6 +1,7 @@ { "test-action": { "vars": [ "TEST_ENV" + , "TIMEOUT_SCALE" , "ATTEMPT" , "name" , "test.sh" @@ -170,6 +171,8 @@ { "type": "join" , "$1": ["shell test ", {"type": "var", "name": "name"}, " failed"] } + , "timeout scaling": + {"type": "var", "name": "TIMEOUT_SCALE", "default": 1.0} } , "else": { "type": "ACTION" @@ -189,6 +192,8 @@ , ")" ] } + , "timeout scaling": + {"type": "var", "name": "TIMEOUT_SCALE", "default": 1.0} } } } @@ -196,6 +201,7 @@ , "test-result": { "vars": [ "TEST_ENV" + , "TIMEOUT_SCALE" , "name" , "test.sh" , "keep" diff --git a/shell/test/RULES b/shell/test/RULES index 19f859f..b952648 100644 --- a/shell/test/RULES +++ b/shell/test/RULES @@ -2,7 +2,8 @@ { "doc": ["Shell test, given by a test script"] , "target_fields": ["deps", "test"] , "string_fields": ["keep", "name"] - , "config_vars": ["ARCH", "HOST_ARCH", "RUNS_PER_TEST", "TEST_ENV"] + , "config_vars": + ["ARCH", "HOST_ARCH", "RUNS_PER_TEST", "TEST_ENV", "TIMEOUT_SCALE"] , "field_doc": { "test": [ "The shell script for the test, launched with sh." @@ -37,6 +38,8 @@ , "If set, no test action will be taken from cache." ] , "TEST_ENV": ["Additional environment for executing the test runner."] + , "TIMEOUT_SCALE": + ["Factor on how to scale the timeout for this test. Defaults to 1.0."] } , "tainted": ["test"] , "artifacts_doc": |