diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-27 16:05:40 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-27 16:06:37 +0300 |
| commit | 562b568abe28ffb96217a961291a1deb36342303 (patch) | |
| tree | 1b80d071cc5185ea16576a1b13a75a6a87ea9541 | |
| parent | eb9d48825144303c9e5b32b678120ce2c6d3d365 (diff) | |
Buildbot: Rename i386 to i686, we don't support pre-i686 CPUs anyway
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 2 | ||||
| -rw-r--r-- | build_files/buildbot/slave_pack.py | 2 | ||||
| -rw-r--r-- | build_files/buildbot/slave_test.py | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 34774c30c1d..5f7e930fa3c 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 c0785ad0bc5..4deb0b1a081 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 a9592813912..78f8f68317d 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']) |