[zorg] Fix lit arg passing for libcxx-libcxxabi-singlethreaded-x86_64-linux-debian

[jroelofs]

Summary

The other way doesn't work... this one should.

[danalbert]

zorg/buildbot/builders/LibcxxAndAbiBuilder.py

89

I think is overrides the default LLVM_LIT_ARGS. Should add the defaults to the passed in list.

[danalbert]

Sounds like the defaults get overridden anyway.

[jroelofs]

Add the defaults explicitly.

[danalbert]

LGTM.

[jroelofs]

Committed r217512.

Thanks!

Jon

zorg/buildbot/builders/LibcxxAndAbiBuilder.py

def getLibcxxAndAbiBuilder(f=None, env={}, additional_features=set()):
     if 'libcpp-has-no-threads' in additional_features:
         env['CXXFLAGS'] = (env.get('CXXFLAGS', '') +
                            ' -D_LIBCPP_HAS_NO_THREADS')
 
     if 'libcpp-has-no-monotonic-clock' in additional_features:
         env['CXXFLAGS'] = (env.get('CXXFLAGS', '') +
                            ' -D_LIBCPP_HAS_NO_MONOTONIC_CLOCK')
 
-    litTestArgs = ''
+    litTestArgs = '-sv --show-unsupported --show-xfail'
     if additional_features:
-        litTestArgs = ('--param=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=False, workdir=src_root))
     f.addStep(buildbot.steps.shell.ShellCommand(
         name='make.builddir', command=['mkdir', build_path],
         haltOnFailure=True, workdir=src_root))
 
     f.addStep(buildbot.steps.shell.ShellCommand(
-        name='cmake', command=['cmake', src_root], haltOnFailure=True,
-        workdir=build_path, env=env))
+        name='cmake', command=['cmake', src_root,
+                               '-DLLVM_LIT_ARGS="'+litTestArgs+'"'],
+        haltOnFailure=True, workdir=build_path, env=env))
 
     # Build libcxxabi
     jobs_flag = properties.WithProperties('-j%(jobs)s')
     f.addStep(buildbot.steps.shell.ShellCommand(
               name='build.libcxxabi', command=['make', jobs_flag, 'cxxabi'],
               haltOnFailure=True, workdir=build_path))
 
     # Build libcxx
     f.addStep(buildbot.steps.shell.ShellCommand(
               name='build.libcxx', command=['make', jobs_flag, 'cxx'],
               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', lit_flags, 'check-libcxxabi'],
+        name='test.libcxxabi', command=['make', 'check-libcxxabi'],
         workdir=build_path))
 
     # Test libc++
     f.addStep(buildbot.steps.shell.ShellCommand(
-        name='test.libcxx', command=['make', lit_flags, 'check-libcxx'],
+        name='test.libcxx', command=['make', 'check-libcxx'],
         workdir=build_path))
 
     return f