[Bf-blender-cvs] [22b03e1c689] master: Fix Python error in benchmark executable detection after recent changes

Brecht Van Lommel noreply at git.blender.org
Mon Jul 26 18:04:46 CEST 2021


Commit: 22b03e1c689561298c46704ca1a99a686ed8e0b5
Author: Brecht Van Lommel
Date:   Thu Jul 22 18:36:45 2021 +0200
Branches: master
https://developer.blender.org/rB22b03e1c689561298c46704ca1a99a686ed8e0b5

Fix Python error in benchmark executable detection after recent changes

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

M	tests/performance/api/environment.py
M	tests/performance/benchmark

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

diff --git a/tests/performance/api/environment.py b/tests/performance/api/environment.py
index 3a9b3eaf936..70fc15f251c 100644
--- a/tests/performance/api/environment.py
+++ b/tests/performance/api/environment.py
@@ -122,7 +122,7 @@ class TestEnvironment:
             executable = executable / self._blender_executable_name()
         elif not executable.is_file() and executable.name == 'blender':
             # Executable path without proper path on Windows or macOS.
-            executable = executable.parent() / self._blender_executable_name()
+            executable = executable.parent / self._blender_executable_name()
 
         if executable.is_file():
             return executable
diff --git a/tests/performance/benchmark b/tests/performance/benchmark
index eb01b6053a7..ad1e07d0ef3 100755
--- a/tests/performance/benchmark
+++ b/tests/performance/benchmark
@@ -125,10 +125,10 @@ def run_entry(env: api.TestEnvironment, config: api.TestConfig, row: List, entry
             entry.error_msg = 'Failed to build'
 
     # Run test and update output and status.
-    entry.status = 'running'
-    print_row(config, row, end='\r')
-
     if executable_ok:
+        entry.status = 'running'
+        print_row(config, row, end='\r')
+
         try:
             entry.output = test.run(env, device_id)
             if not entry.output:



More information about the Bf-blender-cvs mailing list