[llvm-commits] [zorg] r163020 - /zorg/trunk/zorg/buildbot/builders/ClangBuilder.py

[David Blaikie]

Author: dblaikie
Date: Fri Aug 31 15:46:27 2012
New Revision: 163020

URL: http://llvm.org/viewvc/llvm-project?rev=163020&view=rev
Log:
Run check-all rather than check-llvm and check-clang (so we also check clang-extra).

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

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=163020&r1=163019&r2=163020&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Fri Aug 31 15:46:27 2012
@@ -209,20 +209,14 @@
     if run_cxx_tests:
         extraTestDirs += '%(builddir)s/llvm/tools/clang/utils/C++Tests'
     if test:
-        f.addStep(ClangTestCommand(name='test-llvm',
-                                   command=[make, "check-lit", "VERBOSE=1",
+        f.addStep(ClangTestCommand(name='check-all',
+                                   command=[make, "check-all", "VERBOSE=1",
                                             WithProperties("LIT_ARGS=%s" % llvmTestArgs)],
-                                   description=["testing", "llvm"],
-                                   descriptionDone=["test", "llvm"],
+                                   description=["checking"],
+                                   descriptionDone=["checked"],
                                    workdir=llvm_1_objdir,
                                    usePTY=use_pty_in_tests,
                                    env=merged_env))
-        f.addStep(ClangTestCommand(name='test-clang',
-                                   command=[make, 'test', WithProperties('TESTARGS=%s' % clangTestArgs),
-                                            WithProperties('EXTRA_TESTDIRS=%s' % extraTestDirs)],
-                                   workdir='%s/tools/clang' % llvm_1_objdir,
-                                   usePTY=use_pty_in_tests,
-                                   env=merged_env))
 
     # Install llvm and clang.
     if llvm_1_installdir:
@@ -314,20 +308,14 @@
                                           env=merged_env))
 
     if test:
-        f.addStep(ClangTestCommand(name='test-llvm',
-                                   command=[make, "check-lit", "VERBOSE=1",
+        f.addStep(ClangTestCommand(name='check-all',
+                                   command=[make, "check-all", "VERBOSE=1",
                                             WithProperties("LIT_ARGS=%s" % llvmTestArgs)],
-                                   description=["testing", "llvm"],
-                                   descriptionDone=["test", "llvm"],
+                                   description=["checking"],
+                                   descriptionDone=["checked"],
                                    workdir=llvm_2_objdir,
                                    usePTY=use_pty_in_tests,
                                    env=merged_env))
-        f.addStep(ClangTestCommand(name='test-clang',
-                                   command=[make, 'test', WithProperties('TESTARGS=%s' % clangTestArgs),
-                                            WithProperties('EXTRA_TESTDIRS=%s' % extraTestDirs)],
-                                   workdir='%s/tools/clang' % llvm_2_objdir,
-                                   usePTY=use_pty_in_tests,
-                                   env=merged_env))
 
     # Install clang (stage 2).
     f.addStep(ShellCommand(name="rm-install.clang.stage2",