[Bf-blender-cvs] [c41a0f0] buildbot_linux_cmake: Buildbot: Fix ctests

[Sergey Sharybin]

Commit: c41a0f09e48d41b640f0ab552182d2560292f32a
Author: Sergey Sharybin
Date:   Mon Nov 30 20:01:20 2015 +0100
Branches: buildbot_linux_cmake
https://developer.blender.org/rBc41a0f09e48d41b640f0ab552182d2560292f32a

Buildbot: Fix ctests

For somereason Cycles tests started to operate just nice.

In any case there was missing a schroot wrapper for linux slaves.

===================================================================

M	build_files/buildbot/slave_test.py
M	intern/cycles/blender/addon/ui.py

===================================================================

diff --git a/build_files/buildbot/slave_test.py b/build_files/buildbot/slave_test.py
index ef7a4b2..3932c0f 100644
--- a/build_files/buildbot/slave_test.py
+++ b/build_files/buildbot/slave_test.py
@@ -19,6 +19,7 @@
 # <pep8 compliant>
 
 import subprocess
+import os
 import sys
 
 # get builder name
@@ -33,7 +34,20 @@ blender_dir = '../blender.git'
 
 if "cmake" in builder:
     # cmake
-    retcode = subprocess.call(['ctest', '.' '--output-on-failure'])
+
+    build_dir = os.path.abspath(os.path.join('..', 'build', builder))
+    chroot_name = None
+    chroot_prefix = []
+
+    if builder.endswith('x86_64_cmake'):
+        chroot_name = 'buildbot_squeeze_x86_64'
+    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'])
     sys.exit(retcode)
 else:
     # scons
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 98bacd7..e2aa266 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -1651,5 +1651,4 @@ def unregister():
     bpy.types.VIEW3D_HT_header.remove(draw_pause)
 
     for panel in get_panels():
-        if 'CYCLES' in panel.COMPAT_ENGINES:
-                panel.COMPAT_ENGINES.remove('CYCLES')
+        panel.COMPAT_ENGINES.remove('CYCLES')