Flush (work in progress)

[mono.git] / mcs / errors / Makefile

diff --git a/mcs/errors/Makefile b/mcs/errors/Makefile
index cf789ae5d868a3d5bfa04cb8fa2a16f9396f3d03..33b20aaf52b5650f3cc5583e44189946a8326314 100644 (file)
--- a/mcs/errors/Makefile
+++ b/mcs/errors/Makefile
@@ -4,14 +4,7 @@ include ../build/rules.make
 
 with_mono_path = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 
-ifeq (net_1_1, $(PROFILE))
-# force this, we don't case if CSC is broken. This also
-# means we can use --options, yay.
-
-MCS = $(with_mono_path) $(INTERNAL_MCS)
-else
 EXTRA_SUPPORT_FILES = CSFriendAssembly-lib.dll GCS0122-2-lib.dll GCS0730-lib.dll GCS0733-lib.dll GCS1685-lib.dll
-endif
 
 ilasm = $(topdir)/class/lib/$(PROFILE)/ilasm.exe
 ILASM = $(with_mono_path) $(RUNTIME) $(RUNTIME_FLAGS) $(ilasm)
@@ -42,10 +35,10 @@ TEST_SUPPORT_FILES = \
 # mention all targets
 all-local $(STD_TARGETS:=-local):
 
-VALID_PROFILE := $(filter net_1_1 net_2_0 net_2_1 net_4_0, $(PROFILE))
+VALID_PROFILE := $(filter net_2_0 moonlight net_4_0, $(PROFILE))
 ifdef VALID_PROFILE
 
-check: run-mcs-tests 
+qcheck: run-mcs-tests 
 
 # again, run-test is when the tests actually happen, so
 # don't compile on make test.
@@ -56,43 +49,37 @@ test-local:
 run-test-local: clean-local
        $(MAKE) run-mcs-tests
 
-test-everything:
-       $(MAKE) PROFILE=net_1_1 run-test
-       $(MAKE) PROFILE=net_2_0 run-test
-
 ifeq (net_4_0, $(PROFILE))
 COMPILER_NAME = dmcs
-TEST_PATTERN = '*cs*.cs'
+TEST_PATTERN = 'v4'
 endif
-ifeq (net_2_1, $(PROFILE))
+ifeq (moonlight, $(PROFILE))
 COMPILER_NAME = smcs
-TEST_PATTERN = '*cs*.cs'
+TEST_PATTERN = 'v2'
 LOCAL_RUNTIME_FLAGS = --security=temporary-smcs-hack
 endif
 ifeq (net_2_0, $(PROFILE))
 COMPILER_NAME = gmcs
-TEST_PATTERN = '*cs*.cs'
-endif
-ifeq (net_1_1, $(PROFILE))
-COMPILER_NAME = mcs
-TEST_PATTERN = 'cs*.cs'
+TEST_PATTERN = 'v2'
 endif
 
 COMPILER = $(topdir)/class/lib/$(PROFILE)/$(COMPILER_NAME).exe
 TESTER = MONO_RUNTIME='$(RUNTIME)' $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(LOCAL_RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/compiler-tester.exe
 
+# Required to test parser correctly
+TESTER_OPTIONS +=-compiler-options:-v
+
 run-mcs-tests: $(TEST_SUPPORT_FILES)
        $(TESTER) -mode:neg -files:$(TEST_PATTERN) -compiler:$(COMPILER) -issues:known-issues-$(COMPILER_NAME) -log:$(COMPILER_NAME).log $(TESTER_OPTIONS)
 
-cecil:
-       $(TESTER) -mode:neg -files:$(TEST_PATTERN) -compiler:../tests/gmcs.exe -issues:known-issues-$(COMPILER_NAME) -log:$(COMPILER_NAME).log $(TESTER_OPTIONS) -verbose
+endif
 
 clean-local:
        rm -f *.exe *.dll *.log *.mdb dummy.xml *.junk
 
 dist-local: dist-default
 
-install-local uninstall-local:
+csproj-local install-local uninstall-local:
 
 %-lib.dll: %-lib.cs
        $(CSCOMPILE) /target:library /out:$@ $<
@@ -102,5 +89,3 @@ install-local uninstall-local:
 
 %-lib.dll: %-lib.il
        $(ILASM) /dll /out:$@ $<
-
-endif