[llvm-branch-commits] [llvm-branch] r95923 - in /llvm/branches/Apple/Hermes: test/LLVMC/MultiplePluginPriorities.td unittests/ADT/BitVectorTest.cpp unittests/ADT/Makefile

[Dale Johannesen]

Author: johannes
Date: Thu Feb 11 15:26:35 2010
New Revision: 95923

URL: http://llvm.org/viewvc/llvm-project?rev=95923&view=rev
Log:
Merge PPC testsuite manipulation.
--- Merging r95688 into '.':
U    test/LLVMC/MultiplePluginPriorities.td
--- Merging r95700 into '.':
U    unittests/ADT/BitVectorTest.cpp
U    unittests/ADT/Makefile


Modified:
    llvm/branches/Apple/Hermes/test/LLVMC/MultiplePluginPriorities.td
    llvm/branches/Apple/Hermes/unittests/ADT/BitVectorTest.cpp
    llvm/branches/Apple/Hermes/unittests/ADT/Makefile

Modified: llvm/branches/Apple/Hermes/test/LLVMC/MultiplePluginPriorities.td
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Hermes/test/LLVMC/MultiplePluginPriorities.td?rev=95923&r1=95922&r2=95923&view=diff

==============================================================================
--- llvm/branches/Apple/Hermes/test/LLVMC/MultiplePluginPriorities.td (original)
+++ llvm/branches/Apple/Hermes/test/LLVMC/MultiplePluginPriorities.td Thu Feb 11 15:26:35 2010
@@ -1,6 +1,9 @@
 // Check that multiple plugin priorities are not allowed.
 // RUN: ignore tblgen -I %p/../../include --gen-llvmc %s |& grep "More than one 'PluginPriority' instance found"
 
+// Disable for Darwin PPC: <rdar://problem/7598390>
+// XFAIL: powerpc-apple-darwin
+
 include "llvm/CompilerDriver/Common.td"
 
 def Graph : CompilationGraph<[]>;

Modified: llvm/branches/Apple/Hermes/unittests/ADT/BitVectorTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Hermes/unittests/ADT/BitVectorTest.cpp?rev=95923&r1=95922&r2=95923&view=diff

==============================================================================
--- llvm/branches/Apple/Hermes/unittests/ADT/BitVectorTest.cpp (original)
+++ llvm/branches/Apple/Hermes/unittests/ADT/BitVectorTest.cpp Thu Feb 11 15:26:35 2010
@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef XFAIL
 #include "llvm/ADT/BitVector.h"
 #include "gtest/gtest.h"
 
@@ -138,3 +139,4 @@
 }
 
 }
+#endif

Modified: llvm/branches/Apple/Hermes/unittests/ADT/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Hermes/unittests/ADT/Makefile?rev=95923&r1=95922&r2=95923&view=diff

==============================================================================
--- llvm/branches/Apple/Hermes/unittests/ADT/Makefile (original)
+++ llvm/branches/Apple/Hermes/unittests/ADT/Makefile Thu Feb 11 15:26:35 2010
@@ -12,4 +12,12 @@
 LINK_COMPONENTS := core support
 
 include $(LEVEL)/Makefile.config
+
+# Xfail BitVectorTest for now on PPC Darwin.  7598360.
+ifeq ($(ARCH),PowerPC)
+ifeq ($(TARGET_OS),Darwin)
+CPP.Flags += -DXFAIL
+endif
+endif
+
 include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest