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:36:07 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-07-02 13:36:07 +0300
commit6b17b51baa60b046c76594d25824ac13b2238c42 (patch)
tree3e44cda963b4bf475dfbcdaa076fca41e337a47e /build_files
parent3ff984d7465199d34fe018e485b7064fe8babbde (diff)
Buildbot: Attempt to make ctest use proper installed scripts
Diffstat (limited to 'build_files')
-rw-r--r--build_files/buildbot/slave_test.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/build_files/buildbot/slave_test.py b/build_files/buildbot/slave_test.py
index 67fdeb96788..443e776484b 100644
--- a/build_files/buildbot/slave_test.py
+++ b/build_files/buildbot/slave_test.py
@@ -34,6 +34,10 @@ blender_dir = '../blender.git'
if "cmake" in 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 = []
if builder.startswith('linux'):
@@ -49,8 +53,11 @@ if "cmake" in builder:
elif glibc == 'glibc217':
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)
- 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
# on all builders.