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

[Duncan Sands]

Author: baldrick
Date: Wed Mar  7 14:54:39 2012
New Revision: 152241

URL: http://llvm.org/viewvc/llvm-project?rev=152241&view=rev
Log:
Use the misnamed ClangTestCommand to run the dragonegg 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=152241&r1=152240&r2=152241&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py Wed Mar  7 14:54:39 2012
@@ -4,6 +4,7 @@
 from buildbot.steps.shell import Configure, ShellCommand
 from buildbot.steps.shell import WarningCountingShellCommand
 from buildbot.process.properties import WithProperties
+from zorg.buildbot.commands.ClangTestCommand import ClangTestCommand
 from zorg.buildbot.commands.NightlyTestCommand import NightlyTestCommand
 
 def getCCSetting(gcc, gxx):
@@ -510,19 +511,19 @@
                                description='rm test-suite output directory',
                                haltOnFailure=True, workdir='.', env=env))
 
-    f.addStep(ShellCommand(name='make.check',
-                           command=['nice', '-n', '10',
-                                    'make', '-f', '../' + dragonegg_src_dir + '/Makefile',
-                                    WithProperties('GCC=' + gcc),
-                                    WithProperties('LLVM_CONFIG=%(builddir)s/' +
-                                                   llvm_install_dir + '/bin/llvm-config'),
-                                    WithProperties('TOP_DIR=%(builddir)s/' + dragonegg_src_dir),
-                                    WithProperties('LIT_ARGS=-j%s' % jobs),
-                                    'check'
-                                    ],
-                           description='running test-suite',
-                           descriptionDone='run test-suite',
-                           haltOnFailure=True, workdir=dragonegg_obj_dir,
-                           env=env, timeout=timeout*60))
+    f.addStep(ClangTestCommand(name='make.check',
+                               command=['nice', '-n', '10',
+                                        'make', '-f', '../' + dragonegg_src_dir + '/Makefile',
+                                        WithProperties('GCC=' + gcc),
+                                        WithProperties('LLVM_CONFIG=%(builddir)s/' +
+                                                       llvm_install_dir + '/bin/llvm-config'),
+                                        WithProperties('TOP_DIR=%(builddir)s/' + dragonegg_src_dir),
+                                        WithProperties('LIT_ARGS=-j%s' % jobs),
+                                        'check'
+                                        ],
+                               description='running test-suite',
+                               descriptionDone='run test-suite',
+                               haltOnFailure=True, workdir=dragonegg_obj_dir,
+                               env=env, timeout=timeout*60))
 
     return f