2008-03-14 Marek Safar <marek.safar@gmail.com>

[mono.git] / mcs / errors / Makefile

diff --git a/mcs/errors/Makefile b/mcs/errors/Makefile
index 7fb113fdab6847433cbc9bfeffa2b015debc62a8..0e93299a9a723c0cb04e69e685b661719cc16d31 100644 (file)
--- a/mcs/errors/Makefile
+++ b/mcs/errors/Makefile
@@ -38,15 +38,17 @@ TEST_SUPPORT_FILES = \
        CS0433-lib.dll CS0433-2-lib.dll \
        CS0534-3-lib.dll CS0534-4-lib.dll CS0571-3-lib.dll CS0571-5-lib.dll \
        CS0612-2-lib.dll CS0618-2-lib.dll CS0619-8-lib.dll CS0619-17-lib.dll CS0619-32-lib.dll CS0619-33-lib.dll CS0619-36-lib.dll CS0619-42-lib.dll \
-       CS0619-43-lib.dll CS1546-lib.dll CS0619-51-lib.dll CS1681-2-lib.dll \
+       CS0619-43-lib.dll CS1546-lib.dll CS0619-51-lib.dll CS1509-module.dll CS1681-2-lib.dll \
        CS2015-lib.dll CS3005-16-lib.dll CS3013-module.dll CSExternAlias-lib.dll \
        $(EXTRA_SUPPORT_FILES) 
 
-all-local:
+# mention all targets
+all-local $(STD_TARGETS:=-local):
 
-test-local: $(TEST_SUPPORT_FILES)
+VALID_PROFILE := $(filter default net_2_0 net_2_1, $(PROFILE))
+ifdef VALID_PROFILE
 
-run-test-ondotnet-local:
+test-local: $(TEST_SUPPORT_FILES)
 
 # again, run-test is when the tests actually happen, so
 # don't compile on make test.
@@ -59,20 +61,26 @@ test-everything:
 
 ifeq (net_2_1, $(PROFILE))
 COMPILER_NAME = smcs
-else
+TEST_PATTERN = '*cs*.cs'
+LOCAL_RUNTIME_FLAGS = --security=temporary-smcs-hack
+endif
 ifeq (net_2_0, $(PROFILE))
 COMPILER_NAME = gmcs
-else
-COMPILER_NAME = mcs
+TEST_PATTERN = '*cs*.cs'
 endif
+ifeq (default, $(PROFILE))
+COMPILER_NAME = mcs
+TEST_PATTERN = 'cs*.cs'
 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
+
 run-mcs-tests: $(TEST_SUPPORT_FILES)
 
 run-mcs-tests:
        rm -f *.exe
-       MONO_RUNTIME='$(RUNTIME)' $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/compiler-tester.exe negative 0 $(COMPILER) known-issues-$(COMPILER_NAME) $(COMPILER_NAME).log
+       $(TESTER) -mode:neg -files:$(TEST_PATTERN) -compiler:$(COMPILER) -issues:known-issues-$(COMPILER_NAME) -log:$(COMPILER_NAME).log $(TESTER_OPTIONS)
 
 clean-local:
        rm -f *.exe *.dll *.log *.mdb dummy.xml *.junk
@@ -89,3 +97,5 @@ install-local uninstall-local:
 
 %-lib.dll: %-lib.il
        $(ILASM) /dll /out:$@ $<
+
+endif