diff --git a/bazel/labgrid/runner/runner.py b/bazel/labgrid/runner/runner.py index f111cb3719f69938d829119b10b97727e7f7d288..0134be26477ed1681ec3c0d726fbdd0c98551fce 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 @@ -187,11 +190,20 @@ 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", - "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} | { @@ -201,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 [