From 3d6261419f6b4633dbe4fc14de04f81b19f94d20 Mon Sep 17 00:00:00 2001
From: Sebastian Birunt <sebastian.birunt@arm.com>
Date: Wed, 11 Jun 2025 06:45:31 +0100
Subject: [PATCH 1/2] chore(runner): bazel test env

Pass more bazel test environment variables.
---
 bazel/labgrid/runner/runner.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/bazel/labgrid/runner/runner.py b/bazel/labgrid/runner/runner.py
index f111cb3..a94505e 100644
--- a/bazel/labgrid/runner/runner.py
+++ b/bazel/labgrid/runner/runner.py
@@ -187,7 +187,16 @@ class Runner:
 
     @staticmethod
     def _default_env():
-        inherit_env = ["BAZEL_TEST", "TEST_TOTAL_SHARDS", "TEST_SHARD_INDEX"]
+        inherit_env = [
+            "BAZEL_TEST",
+            "LOGNAME",
+            "TEST_SHARD_INDEX",
+            "TEST_SRCDIR",
+            "TEST_TMPDIR",
+            "TEST_TOTAL_SHARDS",
+            "TZ",
+            "USER",
+        ]
 
         env = {
             "XML_OUTPUT_FILE": "results.xml",
-- 
GitLab


From 471e5c6ddc534ae45c30bd8008d0d9a3cf1d3ba2 Mon Sep 17 00:00:00 2001
From: Sebastian Birunt <sebastian.birunt@arm.com>
Date: Wed, 11 Jun 2025 06:46:13 +0100
Subject: [PATCH 2/2] refactor: make class variables

Move common names to class variables.
---
 bazel/labgrid/runner/runner.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/bazel/labgrid/runner/runner.py b/bazel/labgrid/runner/runner.py
index a94505e..0134be2 100644
--- a/bazel/labgrid/runner/runner.py
+++ b/bazel/labgrid/runner/runner.py
@@ -71,6 +71,9 @@ def runner():
 
 
 class Runner:
+    _xml_output_file = "results.xml"
+    _test_shard_status_file = "test.shard"
+
     def __init__(self, transfer, shell):
         self._transfer = transfer
         self._shell = shell
@@ -199,8 +202,8 @@ class Runner:
         ]
 
         env = {
-            "XML_OUTPUT_FILE": "results.xml",
-            "TEST_SHARD_STATUS_FILE": "test.shard",
+            "XML_OUTPUT_FILE": Runner._xml_output_file,
+            "TEST_SHARD_STATUS_FILE": Runner._test_shard_status_file,
         }
 
         return {k: environ.get(k) for k in inherit_env if k in environ} | {
@@ -210,8 +213,8 @@ class Runner:
     @staticmethod
     def _default_downloads():
         get = {
-            "XML_OUTPUT_FILE": "results.xml",
-            "TEST_SHARD_STATUS_FILE": "test.shard",
+            "XML_OUTPUT_FILE": Runner._xml_output_file,
+            "TEST_SHARD_STATUS_FILE": Runner._test_shard_status_file,
         }
 
         return [
-- 
GitLab