[Bf-blender-cvs] [3cc51cf28cc] master: Buildbot: Use correct path to scripts

Sergey Sharybin noreply at git.blender.org
Tue Jul 2 12:53:26 CEST 2019


Commit: 3cc51cf28ccd074da918ff975beb90fd7cdef346
Author: Sergey Sharybin
Date:   Tue Jul 2 12:52:53 2019 +0200
Branches: master
https://developer.blender.org/rB3cc51cf28ccd074da918ff975beb90fd7cdef346

Buildbot: Use correct path to scripts

The `scripts` is to be included into the path, not just the
folder where the scripts are.

Also specify path to datafiles.

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

M	build_files/buildbot/slave_test.py

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

diff --git a/build_files/buildbot/slave_test.py b/build_files/buildbot/slave_test.py
index 443e776484b..43afd011075 100644
--- a/build_files/buildbot/slave_test.py
+++ b/build_files/buildbot/slave_test.py
@@ -38,6 +38,7 @@ if "cmake" in builder:
     # NOTE: For quick test only to see if the approach work.
     # n the future must be replaced with an actual blender version.
     blender_version = '2.80'
+    blender_version_dir = os.path,join(install_dir, blender_version)
     command_prefix = []
 
     if builder.startswith('linux'):
@@ -54,7 +55,8 @@ if "cmake" in builder:
             command_prefix = ['scl', 'enable', 'devtoolset-6', '--']
 
     ctest_env = os.environ.copy()
-    ctest_env['BLENDER_SYSTEM_SCRIPTS'] = os.path.join(install_dir, blender_version)
+    ctest_env['BLENDER_SYSTEM_SCRIPTS'] = os.path.join(blender_version_dir, 'scripts')
+    ctest_env['BLENDER_SYSTEM_DATAFILES'] = os.path.join(blender_version_dir, 'datafiles')
 
     os.chdir(build_dir)
     retcode = subprocess.call(command_prefix + ['ctest', '--output-on-failure'], env=ctest_env)



More information about the Bf-blender-cvs mailing list