[Bf-blender-cvs] [562b568] master: Buildbot: Rename i386 to i686, we don't support pre-i686 CPUs anyway
Sergey Sharybin
noreply at git.blender.org
Sat Feb 27 14:06:57 CET 2016
Commit: 562b568abe28ffb96217a961291a1deb36342303
Author: Sergey Sharybin
Date: Sat Feb 27 14:05:40 2016 +0100
Branches: master
https://developer.blender.org/rB562b568abe28ffb96217a961291a1deb36342303
Buildbot: Rename i386 to i686, we don't support pre-i686 CPUs anyway
===================================================================
M build_files/buildbot/slave_compile.py
M build_files/buildbot/slave_pack.py
M build_files/buildbot/slave_test.py
===================================================================
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 34774c3..5f7e930 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -96,7 +96,7 @@ if 'cmake' in builder:
if builder.endswith('x86_64_cmake'):
chroot_name = 'buildbot_' + deb_name + '_x86_64'
targets = ['player', 'blender']
- elif builder.endswith('i386_cmake'):
+ elif builder.endswith('i686_cmake'):
bits = 32
chroot_name = 'buildbot_' + deb_name + '_i686'
cuda_chroot_name = 'buildbot_' + deb_name + '_x86_64'
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py
index c0785ad..4deb0b1 100644
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -142,7 +142,7 @@ if builder.find('cmake') != -1:
chroot_name = 'buildbot_squeeze_x86_64'
bits = 64
blender_arch = 'x86_64'
- elif builder.endswith('i386_cmake'):
+ elif builder.endswith('i686_cmake'):
chroot_name = 'buildbot_squeeze_i686'
bits = 32
blender_arch = 'i686'
diff --git a/build_files/buildbot/slave_test.py b/build_files/buildbot/slave_test.py
index a959281..78f8f68 100644
--- a/build_files/buildbot/slave_test.py
+++ b/build_files/buildbot/slave_test.py
@@ -43,12 +43,14 @@ if "cmake" in builder:
chroot_name = None
chroot_prefix = []
+ """
if builder.endswith('x86_64_cmake'):
chroot_name = 'buildbot_squeeze_x86_64'
- elif builder.endswith('i386_cmake'):
+ elif builder.endswith('i686_cmake'):
chroot_name = 'buildbot_squeeze_i686'
if chroot_name:
chroot_prefix = ['schroot', '-c', chroot_name, '--']
+ """
os.chdir(build_dir)
retcode = subprocess.call(chroot_prefix + ['ctest', '--output-on-failure'])
More information about the Bf-blender-cvs
mailing list