<div dir="ltr"><div><div>Looks good. Please commit it.<br><br></div>Thanks<br><br></div>Galina<br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, Sep 8, 2014 at 1:21 PM, Jonathan Roelofs <span dir="ltr"><<a href="mailto:jonathan@codesourcery.com" target="_blank">jonathan@codesourcery.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Oops. Sorry about that. Can you please try with the attached patch?<br>
<br>
Jon<span class=""><br>
<br>
On 9/8/14, 2:11 PM, Galina Kistanova wrote:<br>
</span><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">
Hi Jonathan,<br>
<br>
Please check your change, got an exception on it.<br>
<br>
Thanks<br>
<br>
Galina<br>
<br>
<br>
...<br>
File<br>
"/Users/administator/buildbot/<u></u>buildbot_0.8.5/zorg/buildbot/<u></u>osuosl/master/config/builders.<u></u>py",<br>
line 714, in _get_libcxx_builders<br>
'libcpp-has-no-monotonic-<u></u>clock'])),<br>
File<br>
"/Users/administator/buildbot/<u></u>buildbot_0.8.5/zorg/zorg/<u></u>buildbot/builders/<u></u>LibcxxAndAbiBuilder.py",<br>
line 63, in getLibcxxAndAbiBuilder<br>
env['CXXFLAGS'] += ' -DLIBCXXABI_HAS_NO_THREADS=1'<br>
exceptions.KeyError: 'CXXFLAGS'<br>
<br>
<br>
On Fri, Sep 5, 2014 at 11:07 AM, Jonathan Roelofs <<a href="mailto:jonathan@codesourcery.com" target="_blank">jonathan@codesourcery.com</a><br></span><div><div class="h5">
<mailto:<a href="mailto:jonathan@codesourcery.com" target="_blank">jonathan@codesourcery.<u></u>com</a>>> wrote:<br>
<br>
Author: jroelofs<br>
Date: Fri Sep 5 13:07:15 2014<br>
New Revision: 217265<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=217265&view=rev" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project?rev=217265&view=rev</a><br>
Log:<br>
Clean up libcxx-libcxxabi-<u></u>singlethreaded-x86_64-linux-<u></u>debian so that it<br>
passes the feature flags to lit<br>
<br>
<a href="http://reviews.llvm.org/D5215" target="_blank">http://reviews.llvm.org/D5215</a><br>
<br>
Modified:<br>
zorg/trunk/buildbot/osuosl/<u></u>master/config/builders.py<br>
zorg/trunk/zorg/buildbot/<u></u>builders/LibcxxAndAbiBuilder.<u></u>py<br>
<br>
Modified: zorg/trunk/buildbot/osuosl/<u></u>master/config/builders.py<br>
URL:<br>
<a href="http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=217265&r1=217264&r2=217265&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/zorg/trunk/buildbot/<u></u>osuosl/master/config/builders.<u></u>py?rev=217265&r1=217264&r2=<u></u>217265&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- zorg/trunk/buildbot/osuosl/<u></u>master/config/builders.py (original)<br>
+++ zorg/trunk/buildbot/osuosl/<u></u>master/config/builders.py Fri Sep 5 13:07:15<br>
2014<br>
@@ -667,8 +667,10 @@ def _get_libcxx_builders():<br>
'slavenames': ['gribozavr4'],<br>
'builddir': 'libcxx-libcxxabi-<u></u>singlethreaded-x86_64-linux-<u></u>debian',<br>
'factory': LibcxxAndAbiBuilder.<u></u>getLibcxxAndAbiBuilder(<br>
- env={'CC': 'clang', 'CXX': 'clang++',<br>
- 'CXXFLAGS' : '-D_LIBCPP_HAS_NO_THREADS<br>
-DLIBCXXABI_SINGLE_THREADED=1'<u></u>}),<br>
+ env={'CC': 'clang', 'CXX': 'clang++'},<br>
+ additional_features=set(['<u></u>libcxxabi-has-no-threads',<br>
+ 'libcpp-has-no-threads',<br>
+ 'libcpp-has-no-monotonic-<u></u>clock'])),<br>
'category': 'libcxx'},<br>
<br>
{'name': 'libcxx-libcxxabi-x86_64-<u></u>linux-ubuntu',<br>
<br>
Modified: zorg/trunk/zorg/buildbot/<u></u>builders/LibcxxAndAbiBuilder.<u></u>py<br>
URL:<br>
<a href="http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py?rev=217265&r1=217264&r2=217265&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/zorg/trunk/zorg/<u></u>buildbot/builders/<u></u>LibcxxAndAbiBuilder.py?rev=<u></u>217265&r1=217264&r2=217265&<u></u>view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- zorg/trunk/zorg/buildbot/<u></u>builders/LibcxxAndAbiBuilder.<u></u>py (original)<br>
+++ zorg/trunk/zorg/buildbot/<u></u>builders/LibcxxAndAbiBuilder.<u></u>py Fri Sep 5<br>
13:07:15 2014<br>
@@ -42,7 +42,7 @@ def getLibcxxWholeTree(f, src_root):<br>
return f<br>
<br>
<br>
-def getLibcxxAndAbiBuilder(f=None, env={}):<br>
+def getLibcxxAndAbiBuilder(f=None, env={}, additional_features=set()):<br>
if f is None:<br>
f = buildbot.process.factory.<u></u>BuildFactory()<br>
<br>
@@ -59,6 +59,20 @@ def getLibcxxAndAbiBuilder(f=None, env={<br>
<br>
f = getLibcxxWholeTree(f, src_root)<br>
<br>
+ if 'libcxxabi-has-no-threads' in additional_features:<br>
+ env['CXXFLAGS'] += ' -DLIBCXXABI_HAS_NO_THREADS=1'<br>
+<br>
+ if 'libcpp-has-no-threads' in additional_features:<br>
+ env['CXXFLAGS'] += ' -D_LIBCPP_HAS_NO_THREADS'<br>
+<br>
+ if 'libcpp-has-no-monotonic-<u></u>clock' in additional_features:<br>
+ env['CXXFLAGS'] += ' -D_LIBCPP_HAS_NO_MONOTONIC_<u></u>CLOCK'<br>
+<br>
+ litTestArgs = ''<br>
+ if additional_features:<br>
+ litTestArgs = ('--param=additional_features=<u></u>' +<br>
+ ','.join(additional_features))<br>
+<br>
# Nuke/remake build directory and run CMake<br>
f.addStep(buildbot.steps.<u></u>shell.ShellCommand(<br>
name='rm.builddir', command=['rm', '-rf', build_path],<br>
@@ -83,13 +97,14 @@ def getLibcxxAndAbiBuilder(f=None, env={<br>
haltOnFailure=True, workdir=build_path))<br>
<br>
# Test libc++abi<br>
+ lit_flags = properties.WithProperties("<u></u>LIT_ARGS=%s" % litTestArgs)<br>
f.addStep(buildbot.steps.<u></u>shell.ShellCommand(<br>
- name='test.libcxxabi', command=['make', 'check-libcxxabi'],<br>
+ name='test.libcxxabi', command=['make', lit_flags, 'check-libcxxabi'],<br>
workdir=build_path))<br>
<br>
# Test libc++<br>
f.addStep(buildbot.steps.<u></u>shell.ShellCommand(<br>
- name='test.libcxx', command=['make', 'check-libcxx'],<br>
+ name='test.libcxx', command=['make', lit_flags, 'check-libcxx'],<br>
workdir=build_path))<br>
<br>
return f<br>
<br>
<br>
______________________________<u></u>_________________<br>
llvm-commits mailing list<br></div></div>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a> <mailto:<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.<u></u>edu</a>><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/<u></u>mailman/listinfo/llvm-commits</a><br>
<br>
<br><span class="HOEnZb"><font color="#888888">
</font></span></blockquote><span class="HOEnZb"><font color="#888888">
<br>
-- <br>
Jon Roelofs<br>
<a href="mailto:jonathan@codesourcery.com" target="_blank">jonathan@codesourcery.com</a><br>
CodeSourcery / Mentor Embedded<br>
</font></span></blockquote></div><br></div>