2009-01-07 Geoff Norton <gnorton@novell.com>

        * library.make: Allow platform specific exclude tags from the
        test harness suite.
        * darwin.make: Add to the build and add a new NotOnMac test
        category

svn path=/trunk/mcs/; revision=122616

5 files changed, 49 insertions, 2 deletions

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index 43059f83145..a705e734b1a 100644
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-07  Geoff Norton  <gnorton@novell.com>
+
+	* library.make: Allow platform specific exclude tags from the
+	test harness suite.
+	* darwin.make: Add to the build and add a new NotOnMac test
+	category
+
 2008-12-30  Ankit Jain  <jankit@novell.com>
 
 	* library.make (TEST_HARNESS_OUTPUT*): Fix /labels switch.
diff --git a/mcs/build/library.make b/mcs/build/library.make
index 1a70523bea7..f385b972843 100644
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -195,8 +195,8 @@ test-local: $(test_assemblies)
 run-test-local: run-test-lib
 run-test-ondotnet-local: run-test-ondotnet-lib
 
-TEST_HARNESS_EXCLUDES = -exclude=NotWorking,ValueAdd,CAS,InetAccess
-TEST_HARNESS_EXCLUDES_ONDOTNET = /exclude:NotDotNet,CAS
+TEST_HARNESS_EXCLUDES = -exclude=$(PLATFORM_TEST_HARNESS_EXCLUDES)NotWorking,ValueAdd,CAS,InetAccess
+TEST_HARNESS_EXCLUDES_ONDOTNET = /exclude:$(PLATFORM_TEST_HARNESS_EXCLUDES)NotDotNet,CAS
 
 ifdef TEST_HARNESS_VERBOSE
 TEST_HARNESS_OUTPUT = -labels
diff --git a/mcs/build/platforms/darwin.make b/mcs/build/platforms/darwin.make
new file mode 100644
index 00000000000..8a95dda4d5c
--- /dev/null
+++ b/mcs/build/platforms/darwin.make
@@ -0,0 +1,38 @@
+# -*- makefile -*-
+#
+# Platform-specific makefile rules. This one's for linux.
+#
+
+PLATFORM_DEBUG_FLAGS = -debug
+PLATFORM_MCS_FLAGS = -optimize
+PLATFORM_RUNTIME = $(RUNTIME)
+PLATFORM_CORLIB = mscorlib.dll
+PLATFORM_TEST_HARNESS_EXCLUDES = NotOnMac,
+
+EXTERNAL_MCS = mcs
+EXTERNAL_MBAS = mbas
+EXTERNAL_RUNTIME = mono
+RESGEN = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_RESGEN)
+#ILDISASM = monodis
+ILDISASM = false
+
+PLATFORM_PATH_SEPARATOR = :
+
+# Define this if this ever will work on Linux
+# PLATFORM_MAKE_CORLIB_CMP = yes
+
+# This is for changing / to \ on windows
+PLATFORM_CHANGE_SEPARATOR_CMD = cat
+
+hidden_prefix = .
+hidden_suffix = 
+
+platform-check:
+	@:
+# I tried this but apparently Make's version strings aren't that
+# ... consistent between releases. Whatever.
+#
+#	@if ! $(MAKE) --version |grep '^GNU Make version 3' 1>/dev/null 2>&1 ; then \
+#	    echo "*** You need to build MCS with GNU make. Try \`gmake'" ; \
+#	    exit 1 ; \
+#	fi
diff --git a/mcs/build/platforms/linux.make b/mcs/build/platforms/linux.make
index c55283dc5c8..0a63daa7d96 100644
--- a/mcs/build/platforms/linux.make
+++ b/mcs/build/platforms/linux.make
@@ -7,6 +7,7 @@ PLATFORM_DEBUG_FLAGS = -debug
 PLATFORM_MCS_FLAGS = -optimize
 PLATFORM_RUNTIME = $(RUNTIME)
 PLATFORM_CORLIB = mscorlib.dll
+PLATFORM_TEST_HARNESS_EXCLUDES =
 
 EXTERNAL_MCS = mcs
 EXTERNAL_MBAS = mbas
diff --git a/mcs/build/platforms/win32.make b/mcs/build/platforms/win32.make
index 66ca283f0da..7c6b3f1a917 100644
--- a/mcs/build/platforms/win32.make
+++ b/mcs/build/platforms/win32.make
@@ -7,6 +7,7 @@ PLATFORM_DEBUG_FLAGS = /debug+ /debug:full
 PLATFORM_MCS_FLAGS = /nologo /optimize
 PLATFORM_RUNTIME = 
 PLATFORM_CORLIB = mscorlib.dll
+PLATFORM_TEST_HARNESS_EXCLUDES =
 
 EXTERNAL_MCS = mcs
 EXTERNAL_MBAS = vbc.exe