summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Cristian Sarbu <paul.cristian.sarbu@huawei.com>2023-12-05 17:12:57 +0100
committerPaul Cristian Sarbu <paul.cristian.sarbu@huawei.com>2023-12-07 10:00:12 +0100
commit7c40df5210312b35f39f8f7188871ed4ef917f4e (patch)
treef097277da3c764910e7522bdd498c8020d3d1bd9
parent17ec110944f812830bb3eaee97d8b6bd2f1fcd45 (diff)
downloadjustbuild-7c40df5210312b35f39f8f7188871ed4ef917f4e.tar.gz
test rule with_serve: Pass also the commit trees to the test script
-rw-r--r--test/end-to-end/RULES3
-rwxr-xr-xtest/end-to-end/with_serve_test_runner.py5
2 files changed, 7 insertions, 1 deletions
diff --git a/test/end-to-end/RULES b/test/end-to-end/RULES
index 84e771f5..2146d1ac 100644
--- a/test/end-to-end/RULES
+++ b/test/end-to-end/RULES
@@ -251,7 +251,8 @@
, "repos":
[ "The trees, one per entry, that the just serve instance should have"
, "available. The respective commits will be generated and passed to the"
- , "test script as COMMIT_0, COMMIT_1, etc."
+ , "test script as COMMIT_0, COMMIT_1, etc., while their respective root"
+ , "tree identifiers are passed to the test script as TREE_0, TREE_1, etc."
]
}
, "config_doc":
diff --git a/test/end-to-end/with_serve_test_runner.py b/test/end-to-end/with_serve_test_runner.py
index 25723a2c..b76aefd9 100755
--- a/test/end-to-end/with_serve_test_runner.py
+++ b/test/end-to-end/with_serve_test_runner.py
@@ -190,6 +190,11 @@ for repo in os.listdir("data"):
stdout=subprocess.PIPE,
stderr=subprocess.DEVNULL,
cwd=target).stdout.decode('utf-8').strip()
+ repos_env["TREE_%d" % count] = subprocess.run(
+ ["git", "log", "-n", "1", "--format=%T"],
+ stdout=subprocess.PIPE,
+ stderr=subprocess.DEVNULL,
+ cwd=target).stdout.decode('utf-8').strip()
# increase counter
count += 1