From 7d04ed7fb11e5696ace5c62bfc0edd3a9701f4cd Mon Sep 17 00:00:00 2001 From: Paul Cristian Sarbu Date: Mon, 29 Apr 2024 11:12:24 +0200 Subject: test: Actually scale TIMEOUT_SCALE value for long-running tests... ...instead of using absolute values. This was the desidered outcome all along and now it can be done right thanks to the recently added multiplication expression. --- test/TARGETS | 10 +++++++--- test/end-to-end/remote-execution/TARGETS | 5 ++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/test/TARGETS b/test/TARGETS index 96448e2d..fb3bf82b 100644 --- a/test/TARGETS +++ b/test/TARGETS @@ -66,10 +66,14 @@ { "type": "configure" , "tainted": ["test"] , "target": ["./", "bootstrap", "TESTS"] + , "arguments_config": ["TIMEOUT_SCALE"] , "config": - { "type": "let*" - , "bindings": [["TIMEOUT_SCALE", 40.0]] - , "body": {"type": "env", "vars": ["TIMEOUT_SCALE"]} + { "type": "singleton_map" + , "key": "TIMEOUT_SCALE" + , "value": + { "type": "*" + , "$1": [40, {"type": "var", "name": "TIMEOUT_SCALE", "default": 1.0}] + } } } , "test-deps-headers": diff --git a/test/end-to-end/remote-execution/TARGETS b/test/end-to-end/remote-execution/TARGETS index 727197b9..45dc50d5 100644 --- a/test/end-to-end/remote-execution/TARGETS +++ b/test/end-to-end/remote-execution/TARGETS @@ -61,7 +61,10 @@ , "config": { "type": "singleton_map" , "key": "TIMEOUT_SCALE" - , "value": {"type": "var", "name": "TIMEOUT_SCALE", "default": 10} + , "value": + { "type": "*" + , "$1": [10, {"type": "var", "name": "TIMEOUT_SCALE", "default": 1.0}] + } } } , "add-to-cas": -- cgit v1.2.3