Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-07-02 13:52:53 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-07-02 13:52:53 +0300
commit3cc51cf28ccd074da918ff975beb90fd7cdef346 (patch)
treeae5634acbd27baa6568689fbdf40e19b1d347f1f /build_files
parent6b17b51baa60b046c76594d25824ac13b2238c42 (diff)
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.
Diffstat (limited to 'build_files')
-rw-r--r--build_files/buildbot/slave_test.py4
1 files changed, 3 insertions, 1 deletions
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)