[Bf-blender-cvs] [e7356bb0119] master: Buildbot: Fix missing configuration for Win ctest
Sergey Sharybin
noreply at git.blender.org
Tue Jul 2 15:31:27 CEST 2019
Commit: e7356bb01198271617c130788f47facf28259f67
Author: Sergey Sharybin
Date: Tue Jul 2 15:31:06 2019 +0200
Branches: master
https://developer.blender.org/rBe7356bb01198271617c130788f47facf28259f67
Buildbot: Fix missing configuration for Win ctest
===================================================================
M build_files/buildbot/slave_test.py
===================================================================
diff --git a/build_files/buildbot/slave_test.py b/build_files/buildbot/slave_test.py
index f5d998a4ee5..fe24c577966 100644
--- a/build_files/buildbot/slave_test.py
+++ b/build_files/buildbot/slave_test.py
@@ -40,8 +40,11 @@ if "cmake" in builder:
blender_version = '2.80'
blender_version_dir = os.path.join(install_dir, blender_version)
command_prefix = []
+ extra_ctest_args = []
- if builder.startswith('linux'):
+ if builder.startswith('win'):
+ extra_ctest_args += ['-C', 'Release']
+ elif builder.startswith('linux'):
tokens = builder.split("_")
glibc = tokens[1]
if glibc == 'glibc224':
@@ -59,7 +62,8 @@ if "cmake" in builder:
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)
+ retcode = subprocess.call(command_prefix + ['ctest', '--output-on-failure'] + extra_ctest_args,
+ env=ctest_env)
# Always exit with a success, for until we know all the tests are passing
# on all builders.
More information about the Bf-blender-cvs
mailing list