<div dir="ltr"><div><div>Missed the misplaced assertion. Thanks for catching and pointing out!<br>Fixed with r261386.<br><br></div>Thanks<br><br></div>Galina<br><br><br><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Feb 19, 2016 at 4:21 PM, Sean Silva <span dir="ltr"><<a href="mailto:chisophugis@gmail.com" target="_blank">chisophugis@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote"><div><div class="h5">On Fri, Feb 19, 2016 at 3:44 PM, Galina Kistanova via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Author: gkistanova<br>
Date: Fri Feb 19 17:44:19 2016<br>
New Revision: 261378<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=261378&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=261378&view=rev</a><br>
Log:<br>
Commit based on <a href="http://reviews.llvm.org/D17351" rel="noreferrer" target="_blank">http://reviews.llvm.org/D17351</a>. Patch by Mike Edwards.<br>
<br>
Modified:<br>
zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py<br>
<br>
Modified: zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py?rev=261378&r1=261377&r2=261378&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py?rev=261378&r1=261377&r2=261378&view=diff</a><br>
==============================================================================<br>
--- zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py (original)<br>
+++ zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py Fri Feb 19 17:44:19 2016<br>
@@ -13,12 +13,13 @@ def getClangAndLLDBuildFactory(<br>
clean=True,<br>
env=None,<br>
withLLD=True,<br>
- extraCmakeOptions=None,<br>
+ extraCmakeOptions=[],<br>
extraCompilerOptions=None,<br>
buildWithSanitizerOptions=None,<br>
triple=None,<br>
isMSVC=False,<br>
- prefixCommand=["nice", "-n", "10"] # For backward compatibility.<br>
+ prefixCommand=["nice", "-n", "10"], # For backward compatibility.<br>
+ extraLitArgs=None<br>
):<br>
<br>
llvm_srcdir = "llvm.src"<br>
@@ -100,44 +101,39 @@ def getClangAndLLDBuildFactory(<br>
if isMSVC:<br>
options = []<br>
if extraCompilerOptions:<br>
+ assert not any(a.startswith('-DLLVM_LIT_ARGS=') for a in extraCmakeOptions), "Please use extraLitArgs for LIT arguments instead of defining them in extraCmakeOptions."<br></blockquote><div><br></div></div></div><div>This assertion looks misplaced; it seems like it should be under `if extraCmakeOptions:` below. While you are at it, can you change extraCmakeOptions back to defaulting to None and use a more robust `if extraCmakeOptions is not None:` which is good practice in python? (using mutable lists as default arguments in Python is considered bad practice since they behave unexpectedly)</div><span class="HOEnZb"><font color="#888888"><div><br></div><div>-- Sean Silva</div></font></span><div><div class="h5"><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
options += extraCompilerOptions<br>
<br>
if buildWithSanitizerOptions:<br>
options += buildWithSanitizerOptions<br>
<br>
- # FIXME: This is a temporary workaround till all the slaves will<br>
- # be configured to have C_COMPILER and CXX_COMPILER set locally.<br>
- # Will be rolled back later.<br>
- # cmakeCommand = [<br>
- # "cmake",<br>
- # "-DCMAKE_BUILD_TYPE=Release",<br>
- # "-DLLVM_ENABLE_ASSERTIONS=ON",<br>
- # "-DCMAKE_CXX_FLAGS=\"%s\"" % (" ".join(options)),<br>
- # "-DLLVM_LIT_ARGS=\"-v\"",<br>
- # "-G", "Ninja",<br>
- # "../%s" % llvm_srcdir]<br>
+ lit_args = ["-v"]<br>
+ if extraLitArgs:<br>
+ lit_args += extraLitArgs<br>
+ lit_args_str = "-DLLVM_LIT_ARGS=\"%s\"" % (" ".join(lit_args))<br>
<br>
cmakeCommand = [<br>
"cmake",<br>
"-DCMAKE_BUILD_TYPE=Release",<br>
- "-DLLVM_ENABLE_ASSERTIONS=ON"]<br>
+ "-DLLVM_ENABLE_ASSERTIONS=ON"<br>
+ ]<br>
if buildWithSanitizerOptions:<br>
cmakeCommand += [<br>
"-DCMAKE_C_COMPILER=clang",<br>
- "-DCMAKE_CXX_COMPILER=clang++"]<br>
+ "-DCMAKE_CXX_COMPILER=clang++"<br>
+ ]<br>
if triple:<br>
cmakeCommand += [<br>
- "-DLLVM_DEFAULT_TARGET_TRIPLE=%s" % triple]<br>
-<br>
+ "-DLLVM_DEFAULT_TARGET_TRIPLE=%s" % triple<br>
+ ]<br>
if extraCmakeOptions:<br>
cmakeCommand += extraCmakeOptions<br>
-<br>
if not isMSVC:<br>
cmakeCommand += [<br>
"-DCMAKE_C_FLAGS=\"%s\"" % (" ".join(options)),<br>
"-DCMAKE_CXX_FLAGS=\"-std=c++11 %s\"" % (" ".join(options)),<br>
- "-DLLVM_LIT_ARGS=\"-v\"",<br>
]<br>
+ cmakeCommand += lit_args_str<br>
cmakeCommand += [<br>
"-G", "Ninja",<br>
"../%s" % llvm_srcdir<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div></div></div><br></div></div>
</blockquote></div><br></div></div>