[llvm-commits] [zorg] r129997 - /zorg/trunk/buildbot/osuosl/master/config/builders.py

[Galina Kistanova]

Author: gkistanova
Date: Fri Apr 22 12:27:32 2011
New Revision: 129997

URL: http://llvm.org/viewvc/llvm-project?rev=129997&view=rev
Log:
Replace two llvm-gcc cross builders with clang cross builders.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=129997&r1=129996&r2=129997&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Fri Apr 22 12:27:32 2011
@@ -265,88 +265,25 @@
                                                        stage1_config='Release+Asserts',
                                                        stage2_config='Release+Asserts'),
          'category' : 'clang.exp' },
+		 
+        # Clang cross builders.
+        {'name': "clang-x86_64-darwin10-self-mingw32",
+         'slavenames':["kistanova1"],
+         'builddir':"clang-x86_64-darwin10-self-mingw32",
+         'factory': ClangBuilder.getClangBuildFactory(outOfDir=True, jobs=4, test=False,
+													  extra_configure_args=['--build=x86_64-apple-darwin10',
+													  '--host=i686-pc-mingw32',
+													  '--target=i686-pc-mingw32'])},
+													  
+        {'name' : "clang-x86_64-darwin10-cross-mingw32",
+         'slavenames' :["kistanova1"],
+         'builddir' :"clang-x86_64-darwin10-cross-mingw32",
+         'factory': ClangBuilder.getClangBuildFactory(outOfDir=True, jobs=4,  use_pty_in_tests=True, run_cxx_tests=True,
+													  extra_configure_args=['--build=x86_64-apple-darwin10',
+													  '--host=x86_64-apple-darwin10',
+													  '--target=i686-pc-mingw32'])},
 
-        {'name'      : "llvm-gcc-x86_64-darwin10-self-mingw32",
-         'slavenames': [ "kistanova1" ],
-         'builddir'  : "llvm-gcc-x86_64-darwin10-self-mingw32",
-         'factory'   : ScriptedBuilder.getScriptedBuildFactory(
-                       source_code  = [SVN(name='svn-llvm',
-                                           mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm/',
-                                           defaultBranch='trunk',
-                                           workdir="llvm.src"),
-                                       SVN(name='svn-llvm-gcc',
-                                           mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm-gcc-4.2/',
-                                           defaultBranch='trunk',
-                                           workdir="llvm-gcc.src"),],
-                       launcher     = 'llvm-gcc.src/extras/buildbot-launcher',
-                       build_script = 'llvm-gcc.src/extras/build-4-mingw32',
-                       extra_args   = [],
-                       build_steps  = [{'name'          : 'clean',
-                                        'description'   : 'clean',
-                                        'haltOnFailure' : True },
-                                       {'name'          : 'configure_llvm',
-                                        'description'   : 'configure llvm',
-                                        'haltOnFailure' : True },
-                                       {'name'          : 'make_llvm',
-                                        'description'   : 'make llvm',
-                                        'extra_args'    : ['-j8'],  # Extra step-specific properties
-                                        'haltOnFailure' : True },
-                                       {'name'          : 'configure_llvmgcc',
-                                        'description'   : 'configure llvm-gcc',
-                                        'haltOnFailure' : True },
-                                       {'name'          : 'make_llvmgcc',
-                                        'description'   : 'make llvm-gcc',
-                                        'extra_args'    : ['-j8'],
-                                        'haltOnFailure' : True },
-                                       {'name'          : 'install_llvmgcc',
-                                        'description'   : 'install llvm-gcc',
-                                        'haltOnFailure' : True },]),
-         'category'  : 'llvm-gcc' },
-
-        {'name'      : "llvm-gcc-x86_64-darwin10-cross-mingw32",
-         'slavenames': [ "kistanova1" ],
-         'builddir'  : "llvm-gcc-x86_64-darwin10-cross-mingw32",
-         'factory'   : ScriptedBuilder.getScriptedBuildFactory(
-                       source_code  = [SVN(name='svn-llvm',
-                                           mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm/',
-                                           defaultBranch='trunk',
-                                           workdir="llvm.src"),
-                                       SVN(name='svn-llvm-gcc',
-                                           mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm-gcc-4.2/',
-                                           defaultBranch='trunk',
-                                           workdir="llvm-gcc.src"),],
-                       launcher     = 'llvm-gcc.src/extras/buildbot-launcher',
-                       build_script = 'llvm-gcc.src/extras/build-x-4-mingw32',
-                       extra_args   = [],
-                       build_steps  = [{'name'          : 'clean',
-                                        'description'   : 'clean',
-                                        'haltOnFailure' : True },
-                                       {'name'          : 'copy_cross_tools',
-                                        'description'   : 'copy cross-tools',
-                                        'haltOnFailure' : True },
-                                       {'name'          : 'configure_llvm',
-                                        'description'   : 'configure llvm',
-                                        'haltOnFailure' : True },
-                                       {'name'          : 'make_llvm',
-                                        'description'   : 'make llvm',
-                                        'extra_args'    : ['-j8'],  # Extra step-specific properties
-                                        'haltOnFailure' : True },
-                                       {'name'          : 'test_llvm',
-                                        'type'          : ClangTestCommand,
-                                        'description'   : 'test llvm',
-                                        'haltOnFailure' : False },
-                                       {'name'          : 'configure_llvmgcc',
-                                        'description'   : 'configure llvm-gcc',
-                                        'haltOnFailure' : True },
-                                       {'name'          : 'make_llvmgcc',
-                                        'description'   : 'make llvm-gcc',
-                                        'extra_args'    : ['-j8'],
-                                        'haltOnFailure' : True },
-                                       {'name'          : 'install_llvmgcc',
-                                        'description'   : 'install llvm-gcc',
-                                        'haltOnFailure' : True },]),
-         'category'  : 'llvm-gcc' },
-
+        # llvm-gcc cross builders.
         {'name'      : "build-self-4-mingw32",
          'slavenames': [ "kistanova1" ],
          'builddir'  : "build-self-4-mingw32",