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

[danalbert]

zorg/buildbot/builders/LibcxxAndAbiBuilder.py

70

else this is undefined and then used below.

[jroelofs]

Init litTestArgs always. Split out libcxxabi-has-no-threads.

[danalbert]

Other than the quick syntax fixes, LGTM.

zorg/buildbot/builders/LibcxxAndAbiBuilder.py

73

You need to surround the right hand side with () if you split it between two lines.

100

Stray ] at EOL.

[danalbert]

buildbot/osuosl/master/config/builders.py

672

Missed a comma (sorry I'm not catching all of these in one pass... I'm not the best Python interpreter).

[jroelofs]

Fix additional_features list's missing comma.

[danalbert]

LGTM.

[jroelofs]

r217265

zorg/buildbot/builders/LibcxxAndAbiBuilder.py

70

Goood point! Untested code is untested...

buildbot/osuosl/master/config/builders.py

          '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',

zorg/buildbot/builders/LibcxxAndAbiBuilder.py

     return f
 
 
-def getLibcxxAndAbiBuilder(f=None, env={}):
+def getLibcxxAndAbiBuilder(f=None, env={}, additional_features=set()):
     if f is None:
         f = buildbot.process.factory.BuildFactory()
 

 
     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],

               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