[llvm-commits] [zorg] r150302 - in /zorg/trunk: buildbot/osuosl/master/config/builders.py zorg/buildbot/builders/DragonEggBuilder.py

[Duncan Sands]

Author: baldrick
Date: Sat Feb 11 07:09:06 2012
New Revision: 150302

URL: http://llvm.org/viewvc/llvm-project?rev=150302&view=rev
Log:
Give the expensive checks builder a 120 minute timeout.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.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=150302&r1=150301&r2=150302&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Sat Feb 11 07:09:06 2012
@@ -342,7 +342,8 @@
                                                                                                 '--with-mpfr=/opt/cfarm/mpfr',
                                                                                                 '--with-gmp=/opt/cfarm/gmp',
                                                                                                 '--with-mpc=/opt/cfarm/mpc'],
-                                                                      extra_llvm_configure_args=['--enable-optimized', '--enable-assertions', '--enable-expensive-checks']),
+                                                                      extra_llvm_configure_args=['--enable-optimized', '--enable-assertions', '--enable-expensive-checks'],
+                                                                      timeout=120),
          'category'   : 'dragonegg'},
 
         {'name' : 'dragonegg-i686-linux-gcc-4.5-self-host',

Modified: zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py?rev=150302&r1=150301&r2=150302&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py Sat Feb 11 07:09:06 2012
@@ -24,7 +24,8 @@
 def getDragonEggBootstrapFactory(gcc_repository, extra_languages=[],
                                  extra_gcc_configure_args=[],
                                  extra_llvm_configure_args=[],
-                                 clean=True, env={}, jobs='%(jobs)s'):
+                                 clean=True, env={}, jobs='%(jobs)s',
+                                 timeout=20):
     # Add gcc configure arguments required by the plugin.
     gcc_configure_args = extra_gcc_configure_args + ['--enable-plugin',
       '--enable-lto', ','.join(['--enable-languages=c,c++'] + extra_languages)]
@@ -92,7 +93,8 @@
                                                        'make', WithProperties('-j%s' % jobs)],
                                             haltOnFailure = True,
                                             description=['compile', 'gcc', stage],
-                                            workdir=gcc_obj_dir, env=cur_env))
+                                            workdir=gcc_obj_dir, env=cur_env,
+                                            timeout=timeout * 60))
       f.addStep(WarningCountingShellCommand(name = 'install.gcc.%s' % stage,
                                             command = ['nice', '-n', '10',
                                                        'make', 'install'],
@@ -149,7 +151,8 @@
                                                        'make', WithProperties('-j%s' % jobs)],
                                             haltOnFailure = True,
                                             description=['compile', 'llvm', stage],
-                                            workdir=llvm_obj_dir, env=cur_env))
+                                            workdir=llvm_obj_dir, env=cur_env,
+                                            timeout=timeout * 60))
       f.addStep(WarningCountingShellCommand(name = 'install.llvm.%s' % stage,
                                             command = ['nice', '-n', '10',
                                                        'make', 'install'],
@@ -176,7 +179,8 @@
                          ] + getCCSetting(prev_gcc, prev_gxx),
               haltOnFailure = True,
               description=['compile', 'dragonegg pre', stage],
-              workdir=dragonegg_pre_obj_dir, env=cur_env))
+              workdir=dragonegg_pre_obj_dir, env=cur_env,
+              timeout=timeout * 60))
       prev_gcc = '%(builddir)s/'+gcc_install_dir+'/bin/gcc -fplugin=%(builddir)s/'+dragonegg_pre_obj_dir+'/dragonegg.so'
       prev_gxx = '%(builddir)s/'+gcc_install_dir+'/bin/g++ -fplugin=%(builddir)s/'+dragonegg_pre_obj_dir+'/dragonegg.so'
 
@@ -200,7 +204,8 @@
                          ] + getCCSetting(prev_gcc, prev_gxx),
               haltOnFailure = True,
               description=['compile', 'dragonegg', stage],
-              workdir=dragonegg_obj_dir, env=cur_env))
+              workdir=dragonegg_obj_dir, env=cur_env,
+              timeout=timeout * 60))
 
       # Ensure that the following stages use the just built plugin.
       prev_plugin = '%(builddir)s/'+dragonegg_obj_dir+'/dragonegg.so'