merged Sys.Web.Services 2.0 support in my branch:

[mono.git] / mcs / tests / Makefile

diff --git a/mcs/tests/Makefile b/mcs/tests/Makefile
index fd3b650bf27bb30196628e81aec194b59ce68b18..61eb348ea49063390a0efe3b34717cdc59d95c65 100644 (file)
--- a/mcs/tests/Makefile
+++ b/mcs/tests/Makefile
@@ -1,13 +1,13 @@
 #
-# use `run-test-local'
+# use `run-test'
 #
-# *** make sure you add multi-file tests to TEST_ORDERING if necessary
 
 thisdir = tests
 SUBDIRS =
 include ../build/rules.make
 
-DISTFILES = README.tests $(wildcard *.cs) $(wildcard *.il) $(wildcard *.xml) $(wildcard *.inc) $(wildcard known-issues-*)
+DISTFILES = README.tests
+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"
 
@@ -62,8 +62,10 @@ COMPILER = $(topdir)/class/lib/$(PROFILE)/mcs.exe
 TEST_PATTERN = 'test-*.cs'
 endif
 
-run-test-local: ilasm test-377-lib.dll test-443-lib.dll
-       MONO_RUNTIME='mono' $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/compiler-tester.exe positive $(TEST_PATTERN) $(COMPILER) known-issues-$(COMPILER_NAME) $(COMPILER_NAME).log
+TEST_ILS := $(wildcard *-lib.il)
+
+run-test-local: $(TEST_ILS:.il=.dll)
+       MONO_RUNTIME='$(RUNTIME)' $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/compiler-tester.exe positive $(TEST_PATTERN) $(COMPILER) known-issues-$(COMPILER_NAME) $(COMPILER_NAME).log
 
 # do nothing for this target
 run-test-ondotnet-local:
@@ -85,12 +87,13 @@ dist-local: dist-default
 
 %-il.dll: %-il.il
        $(ILASM) /dll $<
-       
+
 %-lib.dll: %-lib.il
        $(ILASM) /dll /out:$@ $<
 
-ilasm:
 ifeq (default, $(PROFILE))
+run-test-local: ilasm
+ilasm:
        $(ILASM) /dll property-il.il
        $(CSCOMPILE) /r:property-il.dll property-main.cs /out:property-main.exe
        $(TEST_RUNTIME) property-main.exe