New tests.

[mono.git] / mcs / tests / Makefile

diff --git a/mcs/tests/Makefile b/mcs/tests/Makefile
index ec448879f12c9076b771356c970a7bd169162aab..9170cb295323a2b85a0d6faf37793b25bbd86932 100644 (file)
--- a/mcs/tests/Makefile
+++ b/mcs/tests/Makefile
@@ -19,7 +19,7 @@ USE_MCS_FLAGS :=
 # mention all targets
 all-local $(STD_TARGETS:=-local):
 
-VALID_PROFILE := $(filter net_2_0 net_2_1 net_4_0, $(PROFILE))
+VALID_PROFILE := $(filter net_2_0 moonlight net_4_0, $(PROFILE))
 ifdef VALID_PROFILE
 # casts
 bootstrap-cast.exe: gen-cast-test.cs
@@ -50,12 +50,14 @@ ifeq (net_4_0, $(PROFILE))
 COMPILER_NAME = dmcs
 TEST_PATTERN = 'v4'
 LOCAL_RUNTIME_FLAGS = --verify-all
+DEFINES = -compiler-options:"-d:NET_4_0"
 #TOPTIONS += '-il:ver-il-dmcs.xml'
 endif
-ifeq (net_2_1, $(PROFILE))
+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
@@ -64,6 +66,7 @@ LOCAL_RUNTIME_FLAGS = --verify-all
 TOPTIONS += '-il:ver-il-gmcs.xml'
 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
 
 TEST_ILS := $(wildcard *-lib.il)
@@ -72,25 +75,17 @@ eval-test:
        $(CSCOMPILE) eval-test.cs -r:Mono.CSharp.dll
        $(with_mono_path) $(RUNTIME) $(RUNTIME_FLAGS) eval-test.exe
 
-check: eval-test
+build-compiler-lib:
        cd ../class/Mono.CSharp && $(MAKE) NO_DIR_CHECK=yes
-       $(TESTER) -mode:pos -files:$(TEST_PATTERN) -compiler:$(COMPILER) -issues:known-issues-$(COMPILER_NAME) -log:$(COMPILER_NAME).log $(TOPTIONS)
+
+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)
 
 test-local:
        @:
 
 run-test-local: $(TEST_ILS:.il=.dll) setup check
 
-# Temporary testing targets
-cecil:
-       rm -f *.mdb
-       $(TESTER) -mode:pos -files:'test-*.cs' -compiler:gmcs.exe -issues:known-issues-$(COMPILER_NAME) -log:$(COMPILER_NAME).log -verbose
-
-cecil2:
-       rm -f *.mdb
-       $(TESTER) -mode:pos -files:'*test-*.cs' -compiler:gmcs.exe -issues:known-issues-$(COMPILER_NAME) -log:$(COMPILER_NAME).log -verbose
-# End  
-
 endif
 
 clean-local:
@@ -108,7 +103,7 @@ csproj-local:
 
 %-lib.dll: %-lib.il
        $(ILASM) /dll /out:$@ $<
-       
+
 setup:
        $(ILASM) /dll property-il.il
        $(CSCOMPILE) /r:property-il.dll property-main.cs /out:property-main.exe