[zorg] r280582 - Attempt to work around libc++ test-suite issues on gribozavr4

[Eric Fiselier via llvm-commits]

Author: ericwf
Date: Sat Sep  3 01:55:42 2016
New Revision: 280582

URL: http://llvm.org/viewvc/llvm-project?rev=280582&view=rev
Log:
Attempt to work around libc++ test-suite issues on gribozavr4

gribozavr4 is a great bot that provides 18 threads and only runs one build
at a time, so the libc++ threading tests shouldn't be timing out, right?

Wrong (I think). I believe the frequent timeouts are caused when all 18 threads
enter certain test directories where all of the tests spawn multiple threads
and all of the tests are naturally flaky.

For this reason I've added the '--shuffle' flag to LIT. Hopefully that will
avoid the failures.

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=280582&r1=280581&r2=280582&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Sat Sep  3 01:55:42 2016
@@ -882,7 +882,8 @@ def _get_libcxx_builders():
          'slavenames': ['gribozavr4'],
          'builddir': 'libcxx-libcxxabi-x86_64-linux-debian',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
-             env={'CC': 'clang', 'CXX': 'clang++'}),
+             env={'CC': 'clang', 'CXX': 'clang++'},
+             lit_extra_args=['--shuffle']),
          'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-x86_64-linux-debian-noexceptions',
@@ -890,7 +891,8 @@ def _get_libcxx_builders():
          'builddir': 'libcxx-libcxxabi-x86_64-linux-debian-noexceptions',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
              env={'CC': 'clang', 'CXX': 'clang++'},
-             cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF'}),
+             cmake_extra_opts={'LIBCXX_ENABLE_EXCEPTIONS': 'OFF'},
+             lit_extra_args=['--shuffle']),
          'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-libunwind-x86_64-linux-debian',
@@ -898,7 +900,8 @@ def _get_libcxx_builders():
          'builddir': 'libcxx-libcxxabi-libunwind-x86_64-linux-debian',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
              env={'CC': 'clang', 'CXX': 'clang++'},
-             cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON'}),
+             cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON'},
+             lit_extra_args=['--shuffle']),
          'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-singlethreaded-x86_64-linux-debian',

Modified: zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py?rev=280582&r1=280581&r2=280582&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py Sat Sep  3 01:55:42 2016
@@ -53,7 +53,8 @@ def getLibcxxWholeTree(f, src_root):
 
 
 def getLibcxxAndAbiBuilder(f=None, env={}, additional_features=set(),
-                           cmake_extra_opts={}, lit_extra_opts={}):
+                           cmake_extra_opts={}, lit_extra_opts={},
+                           lit_extra_args=[]):
     if f is None:
         f = buildbot.process.factory.BuildFactory()
 
@@ -73,6 +74,8 @@ def getLibcxxAndAbiBuilder(f=None, env={
     # Specify the max number of threads using properties so LIT doesn't use
     # all the threads on the system.
     litTestArgs = '-sv --show-unsupported --show-xfail --threads=%(jobs)s'
+    if lit_extra_args:
+        litTestArgs += ' ' + ' '.join(lit_extra_args)
 
     if additional_features:
         litTestArgs += (' --param=additional_features=' +