[llvm-commits] [test-suite] r72818 - in /test-suite/trunk/SingleSource: Makefile.singlesrc UnitTests/Makefile UnitTests/Threads/Makefile

[Daniel Dunbar]

Author: ddunbar
Date: Wed Jun  3 18:37:11 2009
New Revision: 72818

URL: http://llvm.org/viewvc/llvm-project?rev=72818&view=rev
Log:
Add a facility for skipping individual SingleSource tests.
 - Makefiles can define PROGRAMS_TO_SKIP to a list of programs which shouldn't
   be tested.

 - Currently used to skip the "tls" and "2007-04-25-weak" tests on Darwin, where
   they are essentially XFAIL.

Modified:
    test-suite/trunk/SingleSource/Makefile.singlesrc
    test-suite/trunk/SingleSource/UnitTests/Makefile
    test-suite/trunk/SingleSource/UnitTests/Threads/Makefile

Modified: test-suite/trunk/SingleSource/Makefile.singlesrc
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Makefile.singlesrc?rev=72818&r1=72817&r2=72818&view=diff

==============================================================================
--- test-suite/trunk/SingleSource/Makefile.singlesrc (original)
+++ test-suite/trunk/SingleSource/Makefile.singlesrc Wed Jun  3 18:37:11 2009
@@ -16,7 +16,9 @@
 #
 ##===----------------------------------------------------------------------===##
 
-PROGRAMS_TO_TEST = $(patsubst $(SourceDir)%,%,$(basename $(Source)))
+
+PROGRAMS_TO_TEST = $(filter-out $(PROGRAMS_TO_SKIP), \
+	$(patsubst $(SourceDir)%,%,$(basename $(Source))))
 
 include $(LEVEL)/Makefile.programs
 .PRECIOUS: Output/%.linked.rll

Modified: test-suite/trunk/SingleSource/UnitTests/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/Makefile?rev=72818&r1=72817&r2=72818&view=diff

==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/Makefile (original)
+++ test-suite/trunk/SingleSource/UnitTests/Makefile Wed Jun  3 18:37:11 2009
@@ -25,5 +25,11 @@
 endif
 endif
 
+# Darwin doesn't support weak/weak_import in a way that we can test in this
+# framework.
+ifeq ($(OS),Darwin)
+PROGRAMS_TO_SKIP := 2007-04-25-weak
+endif
+
 PROGRAM_REQUIRED_TO_EXIT_OK := 1
 include $(LEVEL)/SingleSource/Makefile.singlesrc

Modified: test-suite/trunk/SingleSource/UnitTests/Threads/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/Threads/Makefile?rev=72818&r1=72817&r2=72818&view=diff

==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/Threads/Makefile (original)
+++ test-suite/trunk/SingleSource/UnitTests/Threads/Makefile Wed Jun  3 18:37:11 2009
@@ -4,4 +4,9 @@
 include $(LEVEL)/Makefile.config
 LDFLAGS += -lpthread
 
+# Darwin doesn't support tls.
+ifeq ($(OS),Darwin)
+PROGRAMS_TO_SKIP := tls
+endif
+
 include $(LEVEL)/SingleSource/Makefile.singlesrc