<div dir="ltr">Hi Jonathan,<br><br>Please check your change, got an exception on it.<br><br>Thanks<br><br>Galina<br><br><br>...<br>  File "/Users/administator/buildbot/buildbot_0.8.5/zorg/buildbot/osuosl/master/config/builders.py", line 714, in _get_libcxx_builders<br>    'libcpp-has-no-monotonic-clock'])),<br>  File "/Users/administator/buildbot/buildbot_0.8.5/zorg/zorg/buildbot/builders/LibcxxAndAbiBuilder.py", line 63, in getLibcxxAndAbiBuilder<br>    env['CXXFLAGS'] += ' -DLIBCXXABI_HAS_NO_THREADS=1'<br>exceptions.KeyError: 'CXXFLAGS'<br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Sep 5, 2014 at 11:07 AM, 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">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-project?rev=217265&view=rev</a><br>
Log:<br>
Clean up libcxx-libcxxabi-singlethreaded-x86_64-linux-debian so that it 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/master/config/builders.py<br>
    zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py<br>
<br>
Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py<br>
URL: <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-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=217265&r1=217264&r2=217265&view=diff</a><br>
==============================================================================<br>
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)<br>
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Fri Sep  5 13:07:15 2014<br>
@@ -667,8 +667,10 @@ def _get_libcxx_builders():<br>
          'slavenames': ['gribozavr4'],<br>
          'builddir': 'libcxx-libcxxabi-singlethreaded-x86_64-linux-debian',<br>
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(<br>
-             env={'CC': 'clang', 'CXX': 'clang++',<br>
-                  'CXXFLAGS' : '-D_LIBCPP_HAS_NO_THREADS -DLIBCXXABI_SINGLE_THREADED=1'}),<br>
+             env={'CC': 'clang', 'CXX': 'clang++'},<br>
+             additional_features=set(['libcxxabi-has-no-threads',<br>
+                                      'libcpp-has-no-threads',<br>
+                                      'libcpp-has-no-monotonic-clock'])),<br>
          'category': 'libcxx'},<br>
<br>
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu',<br>
<br>
Modified: zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py<br>
URL: <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-project/zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py?rev=217265&r1=217264&r2=217265&view=diff</a><br>
==============================================================================<br>
--- zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py (original)<br>
+++ zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py Fri Sep  5 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.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-clock' in additional_features:<br>
+        env['CXXFLAGS'] += ' -D_LIBCPP_HAS_NO_MONOTONIC_CLOCK'<br>
+<br>
+    litTestArgs = ''<br>
+    if additional_features:<br>
+        litTestArgs = ('--param=additional_features=' +<br>
+                       ','.join(additional_features))<br>
+<br>
     # Nuke/remake build directory and run CMake<br>
     f.addStep(buildbot.steps.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("LIT_ARGS=%s" % litTestArgs)<br>
     f.addStep(buildbot.steps.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.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>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>