[zorg] Libiomp5Builder: Use NinjaCommand and simplify LitTestCommand

[Hahnfeld]

Summary

Do as requested in D18887

[gkistanova]

LGTM

Thanks

Galina

zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py

 import os
 
 import buildbot
 import buildbot.process.factory
 from buildbot.steps.source import SVN
 from buildbot.steps.shell import ShellCommand
 from buildbot.steps.shell import WarningCountingShellCommand
 from buildbot.process.properties import WithProperties
-
-import zorg.buildbot.commands as commands
-import zorg.buildbot.commands.LitTestCommand as lit_test_command
+from zorg.buildbot.commands.LitTestCommand import LitTestCommand
+from zorg.buildbot.commands.NinjaCommand import NinjaCommand
 
 
 def getLibompCMakeBuildFactory(clean=True, env=None, ompt=False, test=True, c_compiler="gcc", cxx_compiler="g++"):
 
     # Prepare environmental variables. Set here all env we want everywhere.
     merged_env = {
         'TERM' : 'dumb' # Make sure Clang doesn't use color escape sequences.
                  }
f.addStep(ShellCommand(name='cmake llvm',
                                     "-DCMAKE_CXX_COMPILER="+cxx_compiler],
                            haltOnFailure=True,
                            description='cmake llvm',
                            workdir=llvm_builddir,
                            env=merged_env))
 
     # Make clang build or just llvm utils build
     if c_compiler == "clang": 
-        f.addStep(WarningCountingShellCommand(name='make clang build',
-                                              command=['ninja'],
-                                              haltOnFailure=True,
-                                              description='make clang build',
-                                              workdir=llvm_builddir,
-                                              env=merged_env))
+        f.addStep(NinjaCommand(name="make clang build",
+                               description=["make clang build"],
     else:
-        f.addStep(WarningCountingShellCommand(name='make llvm utils build',
-                                              command=['ninja', 'LLVMX86Utils'],
-                                              haltOnFailure=True,
-                                              description='make llvm utils build',
-                                              workdir=llvm_builddir,
-                                              env=merged_env))
+        f.addStep(NinjaCommand(name="make llvm utils build",
+                               targets=["LLVMX86Utils"],
+                               description=["make llvm utils build"],
 
     if ompt:
-        f.addStep(WarningCountingShellCommand(name='make ompt test utils',
-                                              command=['ninja', 'FileCheck'],
-                                              haltOnFailure=True,
-                                              description='make ompt test utils',
-                                              workdir=llvm_builddir,
-                                              env=merged_env))
+        f.addStep(NinjaCommand(name="make ompt test utils",
+                               targets=["FileCheck"],
+                               description=["make ompt test utils"],
 
     # Add clang/llvm-lit to PATH
     merged_env.update( { 'PATH' : WithProperties("%(workdir)s/" + llvm_builddir + "/bin:" + "${PATH}")} )
 
     # CMake libomp
     command=["cmake", "../"+openmp_srcdir,
              "-DCMAKE_C_COMPILER="+c_compiler,
              "-DCMAKE_CXX_COMPILER="+cxx_compiler]
f.addStep(WarningCountingShellCommand(name='make libomp build',
                                           command=['make'],
                                           haltOnFailure=True,
                                           description='make libomp build',
                                           workdir=openmp_builddir,
                                           env=merged_env))
 
     # Test, if requested
     if test:
-        f.addStep(lit_test_command.LitTestCommand(name='make check-libomp',
-                                                  command=['make', 'check-libomp'],
-                                                  haltOnFailure=True,
-                                                  description=["make check-libomp"],
-                                                  descriptionDone=["build checked"],
-                                                  workdir=openmp_builddir,
-                                                  env=merged_env))
+        f.addStep(LitTestCommand(name="make check-libomp",
+                                 command=["make", "check-libomp"],
 
     return f