summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Aehlig <klaus.aehlig@huawei.com>2025-05-20 14:57:07 +0200
committerKlaus Aehlig <klaus.aehlig@huawei.com>2025-05-20 15:29:40 +0200
commit4e4bd9b4ecb02fc364d4eaab8f68f0ef6df6b6ac (patch)
tree54a25a7eb43b804fdfcd9ed696cfe060eab2683b
parent70f0e4053b6f90945bb5ee04cfe24306776fe840 (diff)
downloadjustbuild-4e4bd9b4ecb02fc364d4eaab8f68f0ef6df6b6ac.tar.gz
end-to-end tests with serve: also keep serve build root
... if serve is used and remote-execution is a separate service.
-rw-r--r--test/end-to-end/EXPRESSIONS11
-rw-r--r--test/end-to-end/RULES2
2 files changed, 11 insertions, 2 deletions
diff --git a/test/end-to-end/EXPRESSIONS b/test/end-to-end/EXPRESSIONS
index 3c8a06c3..6eb3e96d 100644
--- a/test/end-to-end/EXPRESSIONS
+++ b/test/end-to-end/EXPRESSIONS
@@ -14,6 +14,7 @@
, "TEST_REMOTE_EXECUTION"
, "TIMEOUT_SCALE"
, "TEST_STANDALONE_SERVE"
+ , "USES_SERVE"
]
, "imports":
{ "artifacts_list": ["@", "rules", "", "field_artifacts_list"]
@@ -89,8 +90,13 @@
, { "type": "++"
, "$1":
[ { "type": "if"
- , "cond": {"type": "var", "name": "TEST_STANDALONE_SERVE"}
- , "then": ["serve"]
+ , "cond": {"type": "var", "name": "USES_SERVE"}
+ , "then":
+ { "type": "if"
+ , "cond": {"type": "var", "name": "TEST_STANDALONE_SERVE"}
+ , "then": ["serve"]
+ , "else": ["remote", "serve"]
+ }
, "else": ["remote"]
}
, { "type": "foreach"
@@ -216,6 +222,7 @@
, "TEST_REMOTE_EXECUTION"
, "TIMEOUT_SCALE"
, "TEST_STANDALONE_SERVE"
+ , "USES_SERVE"
]
, "imports": {"action": "test-action"}
, "expression":
diff --git a/test/end-to-end/RULES b/test/end-to-end/RULES
index 0e71a45f..31818dad 100644
--- a/test/end-to-end/RULES
+++ b/test/end-to-end/RULES
@@ -117,6 +117,7 @@
{ "type": "let*"
, "bindings":
[ ["test type name", "remote execution"]
+ , ["USES_SERVE", false]
, ["extra_infra", []]
, ["data", {"type": "empty_map"}]
, [ "test.sh"
@@ -412,6 +413,7 @@
{ "type": "let*"
, "bindings":
[ ["test type name", "target-level cache serving"]
+ , ["USES_SERVE", true]
, ["extra_infra", ["servestdout", "servestderr"]]
, [ "test.sh"
, { "type": "context"