archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Buildbot: Attempt to make ctest use proper installed scripts

Browse Source
This commit is contained in:
Sergey Sharybin
2019-07-02 12:36:07 +02:00
parent 3ff984d746
commit 6b17b51baa
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build_files/buildbot/slave_test.py
View File

@@ -34,6 +34,10 @@ blender_dir = '../blender.git'
if "cmake" in builder: if "cmake" in builder:
build_dir = os.path.abspath(os.path.join('..', 'build', builder)) build_dir = os.path.abspath(os.path.join('..', 'build', builder))
install_dir = os.path.abspath(os.path.join('..', 'install', 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'
command_prefix = [] command_prefix = []
if builder.startswith('linux'): if builder.startswith('linux'):
@@ -49,8 +53,11 @@ if "cmake" in builder:
elif glibc == 'glibc217': elif glibc == 'glibc217':
command_prefix = ['scl', 'enable', 'devtoolset-6', '--'] command_prefix = ['scl', 'enable', 'devtoolset-6', '--']
ctest_env = os.environ.copy()
ctest_env['BLENDER_SYSTEM_SCRIPTS'] = os.path.join(install_dir, blender_version)
os.chdir(build_dir) os.chdir(build_dir)
retcode = subprocess.call(command_prefix + ['ctest', '--output-on-failure']) retcode = subprocess.call(command_prefix + ['ctest', '--output-on-failure'], env=ctest_env)
# Always exit with a success, for until we know all the tests are passing # Always exit with a success, for until we know all the tests are passing
# on all builders. # on all builders.