[zorg] r203629 - Filter out static member tests, so we dont have to xfail them on old machines.

[Chris Matthews]

Author: cmatthews
Date: Tue Mar 11 19:04:23 2014
New Revision: 203629

URL: http://llvm.org/viewvc/llvm-project?rev=203629&view=rev
Log:
Filter out static member tests, so we dont have to xfail them on old machines.

Modified:
    zorg/trunk/zorg/buildbot/builders/ClangBuilder.py

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=203629&r1=203628&r2=203629&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Tue Mar 11 19:04:23 2014
@@ -767,7 +767,7 @@ def phasedClang(config_options, is_boots
               name='cp.clang-tools-extra-sources',
               command=['cp', '-Rfv', '../../clang-tools-extra.src', 'extra'],
               haltOnFailure=True, workdir='clang.src/tools',
-              description=['cp', 'clang-tools-extra sources']))    
+              description=['cp', 'clang-tools-extra sources']))
     f.addStep(buildbot.steps.shell.ShellCommand(
               name='cp.debuginfo-tests.sources',
               command=['cp', '-Rfv', 'debuginfo-tests.src',
@@ -868,7 +868,9 @@ def phasedClang(config_options, is_boots
                                               description=['all', 'tests'],
                                               workdir=clang_build_dir))
     # Work around for lldb issue rdar://14929651
-    cmd_str = r"""make VERBOSE=1 LIT_ARGS="-j 1 -v --param run_long_tests=true --filter='debuginfo-tests'" check-all"""
+    # The crazy filter regex is to remove static-member[2].cpp, which requires xcode5 or later.
+    # radar://16295455 tracks the removal of this regex.
+    cmd_str = r"""make VERBOSE=1 LIT_ARGS="-j 1 -v --param run_long_tests=true  --filter='debuginfo-tests.(?!static-member)'" check-all"""
     f.addStep(lit_test_command.LitTestCommand(name='run.llvm.debuginfo-tests', haltOnFailure=True,
                                               command=cmd_str,
                                               description=['all', 'tests'],