[Bf-blender-cvs] [5bfc3a34217] master: Fix error running benchmark script with environment variables for builds

Brecht Van Lommel noreply at git.blender.org
Wed Sep 8 20:26:38 CEST 2021


Commit: 5bfc3a342170f961a5474687434e57b69b5ece2d
Author: Brecht Van Lommel
Date:   Wed Sep 8 19:56:07 2021 +0200
Branches: master
https://developer.blender.org/rB5bfc3a342170f961a5474687434e57b69b5ece2d

Fix error running benchmark script with environment variables for builds

Ref D12434

===================================================================

M	tests/performance/api/config.py

===================================================================

diff --git a/tests/performance/api/config.py b/tests/performance/api/config.py
index aa991e7d7d8..b5e2b390aa3 100644
--- a/tests/performance/api/config.py
+++ b/tests/performance/api/config.py
@@ -161,7 +161,13 @@ class TestConfig:
     def read_blender_executables(env, name) -> List:
         config = TestConfig._read_config_module(env.base_dir / name)
         builds = getattr(config, 'builds', {})
-        return [pathlib.Path(build) for build in builds.values()]
+        executables = []
+
+        for executable in builds.values():
+            executable, _ = TestConfig._split_environment_variables(executable)
+            executables.append(pathlib.Path(executable))
+
+        return executables
 
     @staticmethod
     def _read_config_module(base_dir: pathlib.Path) -> None:
@@ -274,7 +280,8 @@ class TestConfig:
 
         return entries
 
-    def _split_environment_variables(self, revision):
+    @staticmethod
+    def _split_environment_variables(revision):
         if isinstance(revision, str):
             return revision, {}
         else:



More information about the Bf-blender-cvs mailing list