[zorg] r217265 - Clean up libcxx-libcxxabi-singlethreaded-x86_64-linux-debian so that it passes the feature flags to lit

[Galina Kistanova]

Looks good. Please commit it.

Thanks

Galina


On Mon, Sep 8, 2014 at 1:21 PM, Jonathan Roelofs <jonathan at codesourcery.com>
wrote:

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