X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Ftests%2FMakefile;h=9170cb295323a2b85a0d6faf37793b25bbd86932;hb=2d23bfcbce7a3f7e54dcd5911adb88b244baca35;hp=489465776a8831da7a89dcd717f49ac6eefe46fc;hpb=e5fe6c826dda8b351c309ba62d0032cc0bcd926e;p=mono.git

diff --git a/mcs/tests/Makefile b/mcs/tests/Makefile
index 489465776a8..9170cb29532 100644
--- a/mcs/tests/Makefile
+++ b/mcs/tests/Makefile
@@ -1,5 +1,5 @@
 #
-# use `run-test'
+# use make run-test PROFILE=net_2_0
 #
 
 thisdir = tests
@@ -11,24 +11,15 @@ DISTFILES += $(wildcard *.cs) $(wildcard *.il) $(wildcard *.xml) $(wildcard *.in
 
 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)
-endif
-ilasm = $(topdir)/class/lib/net_1_1_bootstrap/ilasm.exe
-ILASM = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(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
+ilasm = $(topdir)/class/lib/$(PROFILE)/ilasm.exe
+ILASM = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(ilasm)
 
 USE_MCS_FLAGS :=
 
 # mention all targets
 all-local $(STD_TARGETS:=-local):
 
-VALID_PROFILE := $(filter net_1_1 net_2_0 net_2_1, $(PROFILE))
+VALID_PROFILE := $(filter net_2_0 moonlight net_4_0, $(PROFILE))
 ifdef VALID_PROFILE
 # casts
 bootstrap-cast.exe: gen-cast-test.cs
@@ -51,56 +42,51 @@ mcs-casts.out: casts-mcs.exe
 
 test-casts: boot-casts.out mcs-casts.out
 	cmp $^
-
-test-local: casts-boot.exe
+	-rm -f bootstrap-cast.exe casts.cs casts-boot.exe casts-mcs.exe boot-casts.out mcs-casts.out
 
 eval.exe: eval-tests.cs
-	
-ifeq (net_2_1, $(PROFILE))
+
+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 (moonlight, $(PROFILE))
 COMPILER_NAME = smcs
-TEST_PATTERN = '*test-*.cs'
+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 = '*test-*.cs'
+TEST_PATTERN = 'v2'
 LOCAL_RUNTIME_FLAGS = --verify-all
 TOPTIONS += '-il:ver-il-gmcs.xml'
 endif
-ifeq (net_1_1, $(PROFILE))
-COMPILER_NAME = mcs
-TEST_PATTERN = 'test-*.cs'
-LOCAL_RUNTIME_FLAGS = --verify-all
-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)
 
-ifeq (net_2_0, $(PROFILE))
 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
-else
-eval-test:
-endif
 
-check: run-test
+build-compiler-lib:
+	cd ../class/Mono.CSharp && $(MAKE) NO_DIR_CHECK=yes
 
-run-test-local: $(TEST_ILS:.il=.dll) eval-test
-	$(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)
 
-# Temporary testing target
-cecil:
-	$(TESTER) -mode:pos -files:'test-*.cs' -compiler:gmcs.exe -issues:known-issues-$(COMPILER_NAME) -log:$(COMPILER_NAME).log
+test-local:
+	@:
 
-test-everything:
-	$(MAKE) PROFILE=net_1_1 run-test
-	$(MAKE) PROFILE=net_2_0 run-test
+run-test-local: $(TEST_ILS:.il=.dll) setup check
 
-test-generics:
-	$(MAKE) PROFILE=net_2_0 run-test
+endif
 
 clean-local:
 	-rm -fr dir-*
@@ -110,21 +96,18 @@ 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:$@ $<
 
-ifeq (net_1_1, $(PROFILE))
-run-test-local: ilasm
-ilasm:
+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
-endif
-
-endif