From 3ff984d7465199d34fe018e485b7064fe8babbde Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 2 Jul 2019 12:07:20 +0200 Subject: Buildbot: Enable GTests and test step --- build_files/buildbot/slave_test.py | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) (limited to 'build_files/buildbot/slave_test.py') 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) -- cgit v1.2.3