New tests.

[mono.git] / mcs / tests / Makefile

diff --git a/mcs/tests/Makefile b/mcs/tests/Makefile
index d08045a7856375dc934e59fca436233b8e9daa80..9170cb295323a2b85a0d6faf37793b25bbd86932 100644 (file)
--- a/mcs/tests/Makefile
+++ b/mcs/tests/Makefile
@@ -14,16 +14,12 @@ with_mono_path = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARA
 ilasm = $(topdir)/class/lib/$(PROFILE)/ilasm.exe
 ILASM = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(ilasm)
 
-ifeq (net_2_0, $(PROFILE))
-BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/net_2_0_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/net_2_0_bootstrap/mcs.exe
-endif
-
 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
@@ -54,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
@@ -74,29 +72,21 @@ TESTER = MONO_RUNTIME='$(RUNTIME)' $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(LOCAL_RUNT
 TEST_ILS := $(wildcard *-lib.il)
 
 eval-test: 
-       $(CSCOMPILE) eval-test.cs -r:$(COMPILER)
+       $(CSCOMPILE) eval-test.cs -r:Mono.CSharp.dll
        $(with_mono_path) $(RUNTIME) $(RUNTIME_FLAGS) eval-test.exe
 
-check: eval-test
-       $(TESTER) -mode:pos -files:$(TEST_PATTERN) -compiler:$(COMPILER) -issues:known-issues-$(COMPILER_NAME) -log:$(COMPILER_NAME).log $(TOPTIONS)
+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)
 
 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  
-
-#test-everything:
-#      $(MAKE) PROFILE=net_2_0 run-test
+endif
 
 clean-local:
        -rm -fr dir-*
@@ -106,12 +96,14 @@ clean-local:
 dist-local: dist-default
        rm -f $(distdir)/casts.cs
 
+csproj-local:
+
 %-il.dll: %-il.il
        $(ILASM) /dll $<
 
 %-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
@@ -119,5 +111,3 @@ setup:
 
        $(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
-       
-endif