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

[Duncan Sands]

Author: baldrick
Date: Tue Dec 11 01:14:20 2012
New Revision: 169825

URL: http://llvm.org/viewvc/llvm-project?rev=169825&view=rev
Log:
Run the LLVM and dragonegg testsuites at every build stage by default.

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=169825&r1=169824&r2=169825&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py Tue Dec 11 01:14:20 2012
@@ -26,6 +26,7 @@
 def getDragonEggBootstrapFactory(gcc_repository, extra_languages=[],
                                  extra_gcc_configure_args=[],
                                  extra_llvm_configure_args=[],
+                                 check_llvm=True, check_dragonegg=True,
                                  clean=True, env={}, jobs='%(jobs)s',
                                  timeout=20):
     # Add gcc configure arguments required by the plugin.
@@ -167,6 +168,18 @@
                                             description=['compile', 'llvm', stage],
                                             workdir=llvm_obj_dir, env=cur_env,
                                             timeout=timeout*60))
+
+      # Optionally run the LLVM testsuite.
+      if check_llvm:
+        f.addStep(ClangTestCommand(name='check.llvm.%s' % stage,
+                                   command=['nice', '-n', '10', 'make',
+                                            WithProperties('LIT_ARGS=-v -j%s' % jobs),
+                                            'check-all'
+                                            ],
+                                   description=['test', 'llvm', stage],
+                                   haltOnFailure=True, workdir=llvm_obj_dir,
+                                   env=env, timeout=timeout*60))
+
       f.addStep(WarningCountingShellCommand(name='install.llvm.%s' % stage,
                                             command=['nice', '-n', '10',
                                                      'make', 'install'],
@@ -226,6 +239,22 @@
                              description=['mv build dir', 'dragonegg', stage],
                              haltOnFailure=True, workdir='.', env=cur_env))
 
+      # Optionally run the dragonegg testsuite.
+      if check_dragonegg:
+        f.addStep(ClangTestCommand(name='check.dragonegg.%s' % stage,
+                                   command=['nice', '-n', '10',
+                                            'make', '-f', '../' + dragonegg_src_dir + '/Makefile',
+                                            WithProperties('GCC=%(builddir)s/'+gcc_install_dir+'/bin/gcc'),
+                                            WithProperties('LLVM_CONFIG=%(builddir)s/' +
+                                                           llvm_install_dir + '/bin/llvm-config'),
+                                            WithProperties('TOP_DIR=%(builddir)s/' + dragonegg_src_dir),
+                                            WithProperties('LIT_ARGS=-v -j%s' % jobs),
+                                            'check'
+                                            ],
+                                   description=['test', 'dragonegg', stage],
+                                   haltOnFailure=True, workdir=dragonegg_obj_dir,
+                                   env=env, timeout=timeout*60))
+
       # Ensure that the following stages use the just built plugin.
       prev_plugin = '%(builddir)s/'+dragonegg_obj_dir+'/dragonegg.so'
       prev_gcc = '%(builddir)s/'+gcc_install_dir+'/bin/gcc -fplugin=' + prev_plugin