Commit: 3ff984d7465199d34fe018e485b7064fe8babbde Author: Sergey Sharybin Date: Tue Jul 2 12:07:20 2019 +0200 Branches: master https://developer.blender.org/rB3ff984d7465199d34fe018e485b7064fe8babbde
Buildbot: Enable GTests and test step =================================================================== M build_files/buildbot/slave_compile.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 70958ef9d85..55543055e5b 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -61,7 +61,8 @@ if 'cmake' in builder: # Set build options. cmake_options = [] - cmake_extra_options = ['-DCMAKE_BUILD_TYPE:STRING=Release'] + cmake_extra_options = ['-DCMAKE_BUILD_TYPE:STRING=Release', + '-DWITH_GTESTS=ON'] if builder.startswith('mac'): # Set up OSX architecture diff --git a/build_files/buildbot/slave_test.py b/build_files/buildbot/slave_test.py index cd4730cba25..67fdeb96788 100644 --- a/build_files/buildbot/slave_test.py +++ b/build_files/buildbot/slave_test.py @@ -33,27 +33,28 @@ builder = sys.argv[1] blender_dir = '../blender.git' if "cmake" in builder: - # cmake - - print("Automated tests are still DISABLED!") - sys.exit(0) - build_dir = os.path.abspath(os.path.join('..', 'build', builder)) - chroot_name = None - chroot_prefix = [] - - """ - if builder.endswith('x86_64_cmake'): - chroot_name = 'buildbot_jessie_x86_64' - elif builder.endswith('i686_cmake'): - chroot_name = 'buildbot_jessie_i686' - if chroot_name: - chroot_prefix = ['schroot', '-c', chroot_name, '--'] - """ + command_prefix = [] + + if builder.startswith('linux'): + tokens = builder.split("_") + glibc = tokens[1] + if glibc == 'glibc224': + deb_name = "stretch" + if builder.endswith('x86_64_cmake'): + chroot_name = 'buildbot_' + deb_name + '_x86_64' + elif builder.endswith('i686_cmake'): + chroot_name = 'buildbot_' + deb_name + '_i686' + command_prefix = ['schroot', '-c', chroot_name, '--'] + elif glibc == 'glibc217': + command_prefix = ['scl', 'enable', 'devtoolset-6', '--'] os.chdir(build_dir) - retcode = subprocess.call(chroot_prefix + ['ctest', '--output-on-failure']) - sys.exit(retcode) + retcode = subprocess.call(command_prefix + ['ctest', '--output-on-failure']) + + # Always exit with a success, for until we know all the tests are passing + # on all builders. + sys.exit(0) else: print("Unknown building system") sys.exit(1) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs