Buildbot: Rename i386 to i686, we don't support pre-i686 CPUs anyway
This commit is contained in:
parent
eb9d488251
commit
562b568abe
|
@ -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'
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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'])
|
||||
|
|
Loading…
Reference in New Issue