summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPaul Cristian Sarbu <paul.cristian.sarbu@huawei.com>2024-04-29 11:12:24 +0200
committerPaul Cristian Sarbu <paul.cristian.sarbu@huawei.com>2024-04-29 11:36:09 +0200
commit7d04ed7fb11e5696ace5c62bfc0edd3a9701f4cd (patch)
tree574da8b9eaaf4849a5bc5a791a1210521fa17252 /test
parent0b011c635ae2e76f4329705f78b62e23364975cd (diff)
downloadjustbuild-7d04ed7fb11e5696ace5c62bfc0edd3a9701f4cd.tar.gz
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.
Diffstat (limited to 'test')
-rw-r--r--test/TARGETS10
-rw-r--r--test/end-to-end/remote-execution/TARGETS5
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":