Merge pull request #901 from Blewzman/FixAggregateExceptionGetBaseException

[mono.git] / mcs / tests / Makefile

diff --git a/mcs/tests/Makefile b/mcs/tests/Makefile
index 9170cb295323a2b85a0d6faf37793b25bbd86932..33925e7df282c7380770f962b61223024d5b71f3 100644 (file)
--- a/mcs/tests/Makefile
+++ b/mcs/tests/Makefile
@@ -6,7 +6,7 @@ thisdir = tests
 SUBDIRS =
 include ../build/rules.make
 
-DISTFILES = README.tests $(wildcard dlls/**/*.cs)
+DISTFILES = $(wildcard dlls/**/*.cs) $(wildcard dlls/*.cs) $(wildcard dlls/*.inc)
 DISTFILES += $(wildcard *.cs) $(wildcard *.il) $(wildcard *.xml) $(wildcard *.inc) $(wildcard known-issues-*) $(wildcard *.snk)
 
 with_mono_path = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
@@ -19,7 +19,7 @@ USE_MCS_FLAGS :=
 # mention all targets
 all-local $(STD_TARGETS:=-local):
 
-VALID_PROFILE := $(filter net_2_0 moonlight net_4_0, $(PROFILE))
+VALID_PROFILE := $(filter net_4_5, $(PROFILE))
 ifdef VALID_PROFILE
 # casts
 bootstrap-cast.exe: gen-cast-test.cs
@@ -44,47 +44,36 @@ test-casts: boot-casts.out mcs-casts.out
        cmp $^
        -rm -f bootstrap-cast.exe casts.cs casts-boot.exe casts-mcs.exe boot-casts.out mcs-casts.out
 
-eval.exe: eval-tests.cs
+TEST_PATTERN = 'v2'
 
-ifeq (net_4_0, $(PROFILE))
-COMPILER_NAME = dmcs
+ifeq (net_4_5, $(PROFILE))
 TEST_PATTERN = 'v4'
-LOCAL_RUNTIME_FLAGS = --verify-all
-DEFINES = -compiler-options:"-d:NET_4_0"
-#TOPTIONS += '-il:ver-il-dmcs.xml'
-endif
-ifeq (moonlight, $(PROFILE))
-COMPILER_NAME = smcs
-TEST_PATTERN = 'v2'
-LOCAL_RUNTIME_FLAGS = --security=temporary-smcs-hack
-DEFINES = -compiler-options:"-d:MOONLIGHT"
-endif
-ifeq (net_2_0, $(PROFILE))
-COMPILER_NAME = gmcs
-TEST_PATTERN = 'v2'
-LOCAL_RUNTIME_FLAGS = --verify-all
-TOPTIONS += '-il:ver-il-gmcs.xml'
+DEFINES = -compiler-options:"-d:NET_4_0;NET_4_5"
 endif
 
-COMPILER = $(topdir)/class/lib/$(PROFILE)/$(COMPILER_NAME).exe
+LOCAL_RUNTIME_FLAGS = --verify-all
+COMPILER = $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/mcs.exe
 TESTER = MONO_RUNTIME='$(RUNTIME)' $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(LOCAL_RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/compiler-tester.exe
 
 TEST_ILS := $(wildcard *-lib.il)
 
-eval-test: 
-       $(CSCOMPILE) eval-test.cs -r:Mono.CSharp.dll
-       $(with_mono_path) $(RUNTIME) $(RUNTIME_FLAGS) eval-test.exe
-
 build-compiler-lib:
        cd ../class/Mono.CSharp && $(MAKE) NO_DIR_CHECK=yes
 
-qcheck: build-compiler-lib eval-test
-       $(TESTER) -mode:pos -files:$(TEST_PATTERN) -compiler:$(COMPILER) -issues:known-issues-$(COMPILER_NAME) -log:$(COMPILER_NAME).log $(TOPTIONS) $(DEFINES)
+qcheck: build-compiler-lib qcheck2
+       
+qcheck2:
+       $(TESTER) -mode:pos -files:$(TEST_PATTERN) -compiler:$(COMPILER) -issues:known-issues-$(PROFILE) -log:$(PROFILE).log -il:ver-il-$(PROFILE).xml $(DEFINES) $(TOPTIONS)
+
+gen-mt-tests:
+       $(TESTER) -mode:nunit -files:'v2' -compiler:$(COMPILER) -issues:known-issues-mt -compiler-options:"-lib:$(topdir)/class/lib/monotouch projects/MonoTouch/ivt.cs"
 
 test-local:
        @:
 
-run-test-local: $(TEST_ILS:.il=.dll) setup check
+run-test-local: $(TEST_ILS:.il=.dll) setup qcheck
+
+check: run-test-local
 
 endif
 
@@ -105,9 +94,6 @@ csproj-local:
        $(ILASM) /dll /out:$@ $<
 
 setup:
-       $(ILASM) /dll property-il.il
-       $(CSCOMPILE) /r:property-il.dll property-main.cs /out:property-main.exe
-       $(TEST_RUNTIME) property-main.exe
-
        $(CSCOMPILE) -t:library dlls/test-679-2/test-679-lib-2.cs
        $(CSCOMPILE) -t:library dlls/test-679-1/test-679-lib.cs -r:dlls/test-679-2/test-679-lib-2.dll
+       $(ILASM) -dll dlls/test-883.il