X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2FMakefile;h=fe677dd1e2110a3b8a32c0e87f7df1e46403dd73;hb=a7e4ce11c88bff7b86d57bab6ee7e7e3f31139ae;hp=10940059172ac9a4281a760c696fab9d06f535a0;hpb=44dbe3011ec90b20e59fd04a91d0d4e123dd4f44;p=mono.git

diff --git a/mcs/Makefile b/mcs/Makefile
index 10940059172..fe677dd1e21 100644
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -1,12 +1,41 @@
 thisdir := .
 
-SUBDIRS := build jay mcs monoresgen class mbas nunit20 ilasm tools tests errors docs
+SUBDIRS := build jay mcs class nunit20 ilasm tools tests errors docs
 DIST_ONLY_SUBDIRS := gmcs
 
-basic_SUBDIRS := jay mcs class
-net_1_1_bootstrap_SUBDIRS := jay mcs class tools
-net_2_0_bootstrap_SUBDIRS := class
-net_2_0_SUBDIRS := jay gmcs class nunit20 tests errors tools
+basic_SUBDIRS := build jay mcs class
+net_1_1_bootstrap_SUBDIRS := build jay mcs class ilasm tools
+net_2_0_bootstrap_SUBDIRS := build class ilasm tools
+net_2_0_SUBDIRS := build jay gmcs class nunit20 ilasm tests errors tools
+
+# List of test subdirs that should pass 100%
+centum_tests := \
+	class/corlib \
+	class/System \
+	class/Commons.Xml.Relaxng \
+	class/Cscompmgd \
+	class/Microsoft.JScript \
+	class/Mono.Posix \
+	class/Mono.Security \
+	class/System.Messaging \
+	class/System.Runtime.Remoting \
+	class/System.Runtime.Serialization.Formatters.Soap \
+	class/System.Security \
+	class/System.ServiceProcess \
+	class/System.Web.Services \
+	tests \
+	errors
+
+default_centum_tests :=		\
+	$(centum_tests) 	\
+	class/System.XML	\
+	class/System.Data
+
+net_2_0_centum_tests := $(centum_tests) #class/Mono.C5
+
+ifdef ONLY_CENTUM_TESTS
+TEST_SUBDIRS := $($(PROFILE)_centum_tests)
+endif
 
 ifdef TEST_SUBDIRS
 $(PROFILE)_SUBDIRS := $(TEST_SUBDIRS)
@@ -35,22 +64,16 @@ profiles-do--%:
 profile-do--%:
 	$(MAKE) PROFILE=$(subst --, ,$*)
 
+# We don't want to run the tests in parallel.  We want behaviour like -k.
 profiles-do--run-test:
-	ret=:; \
-	$(MAKE) PROFILE=default run-test || ret=false; \
-	$(MAKE) PROFILE=net_2_0 run-test && $$ret
+	ret=:; $(foreach p,$(PROFILES), { $(MAKE) PROFILE=$(p) run-test || ret=false; }; ) $$ret
 
 # Orchestrate the bootstrap here.
-profiles-do--all: profile-do--net_2_0--all
-	@:
-
-profile-do--net_2_0--all: profile-do--net_2_0_bootstrap--all
-profile-do--net_2_0_bootstrap--all: profile-do--default--all
-
-ifeq (linux, $(PLATFORM))
-profile-do--default--all: profile-do--net_1_1_bootstrap--all
-profile-do--net_1_1_bootstrap--all: profile-do--basic--all
-endif
+_boot_ = all clean install
+$(_boot_:%=profile-do--net_2_0--%):           profile-do--net_2_0--%:           profile-do--net_2_0_bootstrap--%
+$(_boot_:%=profile-do--net_2_0_bootstrap--%): profile-do--net_2_0_bootstrap--%: profile-do--default--%
+$(_boot_:%=profile-do--default--%):           profile-do--default--%:           profile-do--net_1_1_bootstrap--%
+$(_boot_:%=profile-do--net_1_1_bootstrap--%): profile-do--net_1_1_bootstrap--%: profile-do--basic--%
 
 testcorlib:
 	@cd class/corlib && $(MAKE) test run-test
@@ -73,13 +96,15 @@ DISTFILES = \
 	LICENSE			\
 	LICENSE.GPL		\
 	LICENSE.LGPL		\
+	LICENSE.MPL		\
 	Makefile		\
 	mkinstalldirs		\
 	MIT.X11			\
 	MonoIcon.png		\
 	README			\
 	ScalableMonoIcon.svg	\
-	winexe.in
+	winexe.in		\
+	nunit.key
 
 dist-local: dist-default