From 3cc51cf28ccd074da918ff975beb90fd7cdef346 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 2 Jul 2019 12:52:53 +0200 Subject: 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. --- build_files/buildbot/slave_test.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'build_files') 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) -- cgit v1.2.3