[llvm-commits] [zorg] r154316 - /zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py

[Duncan Sands]

Author: baldrick
Date: Mon Apr  9 08:30:28 2012
New Revision: 154316

URL: http://llvm.org/viewvc/llvm-project?rev=154316&view=rev
Log:
Pass the time limit through to the testsuite.  Make it possible to pass
additional configure args to the testsuite.

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

Modified: zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py?rev=154316&r1=154315&r2=154316&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py Mon Apr  9 08:30:28 2012
@@ -227,6 +227,7 @@
 
 def getDragonEggNightlyTestBuildFactory(gcc='gcc', gxx='g++',
                                         llvm_configure_args=[],
+                                        testsuite_configure_args=[],
                                         xfails=[], clean=True, env={},
                                         jobs='%(jobs)s', timeout=20):
     f = buildbot.process.factory.BuildFactory()
@@ -344,7 +345,8 @@
                                  WithProperties('--with-llvmsrc=%(builddir)s/' + llvm_src_dir),
                                  WithProperties('--with-llvmobj=%(builddir)s/' + llvm_obj_dir),
                                  WithProperties('--with-llvmgccdir=%(builddir)s/'),
-                                 '--with-llvmcc=llvm-gcc', 'CC=' + gcc, 'CXX=' + gxx],
+                                 '--with-llvmcc=llvm-gcc', 'CC=' + gcc, 'CXX=' + gxx] +
+                                 testsuite_configure_args,
                         description='configuring nightly test-suite',
                         descriptionDone='configure nightly test-suite',
                         haltOnFailure=True, workdir=testsuite_obj_dir, env=env))
@@ -360,6 +362,7 @@
                                  command=['make', WithProperties('-j%s' % jobs),
                                           'ENABLE_PARALLEL_REPORT=1',
                                           'DISABLE_CBE=1', 'DISABLE_JIT=1',
+                                          'RUNTIMELIMIT=%s' % (timeout*60),
                                           'TEST=nightly', 'report'],
                                  logfiles={'report' : 'report.nightly.txt'},
                                  description='running nightly test-suite',