[zorg] r318726 - OpenMPBuilder: Fix property substitution for lit arguments

[Jonas Hahnfeld via llvm-commits]

Author: hahnfeld
Date: Mon Nov 20 18:29:04 2017
New Revision: 318726

URL: http://llvm.org/viewvc/llvm-project?rev=318726&view=rev
Log:
OpenMPBuilder: Fix property substitution for lit arguments

The result of WithProperties needs to be rendered for a particular
build. That is why the current string conversion doesn't work.
Solve the problem by deferring the call to WithProperties until
we have built the complete argument string so that the returned
value can be passed as-is with the command array.

Differential Revision: https://reviews.llvm.org/D39690

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=318726&r1=318725&r2=318726&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/OpenMPBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/OpenMPBuilder.py Mon Nov 20 18:29:04 2017
@@ -122,10 +122,10 @@ def getOpenMPCMakeBuildFactory(
         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]
+        lit_args = '-v --show-unsupported --show-xfail -j %s' % jobs
+        cmake_args += [WithProperties('-DLIBOMP_LIT_ARGS="%s"' % lit_args)]
         if test_libomptarget:
-            cmake_args += ['-DLIBOMPTARGET_LIT_ARGS="%s"' % lit_args]
+            cmake_args += [WithProperties('-DLIBOMPTARGET_LIT_ARGS="%s"' % lit_args)]
 
     f.addStep(
         Configure(