[zorg] r316901 - OpenMPBuilder: Fix arguments for lit with ninja

[Jonas Hahnfeld via llvm-commits]

Author: hahnfeld
Date: Mon Oct 30 06:40:07 2017
New Revision: 316901

URL: http://llvm.org/viewvc/llvm-project?rev=316901&view=rev
Log:
OpenMPBuilder: Fix arguments for lit with ninja

ninja requires the arguments for lit to be specified via CMake.

Fix for: https://reviews.llvm.org/D39070

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

Modified: zorg/trunk/zorg/buildbot/builders/OpenMPBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/OpenMPBuilder.py?rev=316901&r1=316900&r2=316901&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/OpenMPBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/OpenMPBuilder.py Mon Oct 30 06:40:07 2017
@@ -120,6 +120,13 @@ def getOpenMPCMakeBuildFactory(
         cmake_args += ['-DOPENMP_ENABLE_LIBOMPTARGET=ON']
     if ompt:
         cmake_args += ['-DLIBOMP_OMPT_SUPPORT=ON']
+
+    if test:
+        lit_args = WithProperties('-v --show-unsupported --show-xfail -j %s' % jobs)
+        cmake_args += ['-DLIBOMP_LIT_ARGS="%s"' % lit_args]
+        if test_libomptarget:
+            cmake_args += ['-DLIBOMPTARGET_LIT_ARGS="%s"' % lit_args]
+
     f.addStep(
         Configure(
             name        = 'configure-openmp',
@@ -138,8 +145,7 @@ def getOpenMPCMakeBuildFactory(
 
     # Test OpenMP runtime libraries, if requested.
     if test:
-        ninja_test_args  = ['ninja', WithProperties('-j %s' % jobs)]
-        ninja_test_args += [WithProperties('LIT_ARGS=-v -j %s' % jobs)]
+        ninja_test_args = ['ninja', WithProperties('-j %s' % jobs)]
         f.addStep(
             LitTestCommand(
                 name        = 'test-libomp',