[llvm-commits] [zorg] r114959 - /zorg/trunk/zorg/buildbot/builders/LLVMGCCBuilder.py

[Duncan Sands]

Author: baldrick
Date: Tue Sep 28 11:26:05 2010
New Revision: 114959

URL: http://llvm.org/viewvc/llvm-project?rev=114959&view=rev
Log:
Make it possible to specify an explicit timeout for the llvm-gcc
self-host build (defaults to 20 minutes).

Modified:
    zorg/trunk/zorg/buildbot/builders/LLVMGCCBuilder.py

Modified: zorg/trunk/zorg/buildbot/builders/LLVMGCCBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLVMGCCBuilder.py?rev=114959&r1=114958&r2=114959&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLVMGCCBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLVMGCCBuilder.py Tue Sep 28 11:26:05 2010
@@ -14,7 +14,7 @@
                            useTwoStage=True, stage1_config='Release+Asserts',
                            stage2_config='Release+Asserts', make='make',
                            extra_configure_args=[], verbose=False, env = {},
-                           defaultBranch='trunk'):
+                           defaultBranch='trunk', timeout=20):
   if build or host or target:
     if not build or not host or not target:
       raise ValueError,"Must specify all of 'build', 'host', 'target' if used."
@@ -83,7 +83,8 @@
                                                      "llvm",
                                                      "(stage 1)",
                                                      stage1_config],
-                                        workdir="llvm.obj", env=env))
+                                        workdir="llvm.obj", env=env,
+                                        timeout=timeout*60))
 
   # Run LLVM tests (stage 1).
   f.addStep(ClangTestCommand(name = 'test.llvm.stage1',
@@ -129,7 +130,8 @@
                                         haltOnFailure=True,
                                         description=["compile",
                                                      "llvm-gcc"],
-                                        workdir="llvm-gcc.obj", env=env))
+                                        workdir="llvm-gcc.obj", env=env,
+                                        timeout=timeout*60))
 
   # Clean up llvm-gcc install.
   if clean:
@@ -188,7 +190,8 @@
                                                      "llvm",
                                                      "(stage 2)",
                                                      stage2_config],
-                                        workdir="llvm.obj.2", env=env))
+                                        workdir="llvm.obj.2", env=env,
+                                        timeout=timeout*60))
 
   # Run LLVM tests (stage 2).
   f.addStep(ClangTestCommand(name = 'test.llvm.stage2',
@@ -230,7 +233,8 @@
                                         description=["compile",
                                                      "llvm-gcc",
                                                      "(stage 2)"],
-                                        workdir="llvm-gcc.obj.2", env=env))
+                                        workdir="llvm-gcc.obj.2", env=env,
+                                        timeout=timeout*60))
 
   # Clean up llvm-gcc install (stage 2).
   if clean: