New test.

[mono.git] / mcs / errors / Makefile

diff --git a/mcs/errors/Makefile b/mcs/errors/Makefile
index 8e0f0b199b180357db17fbefab6033f85246a4eb..64545f3c80aba0ada7c2ae86547510947dea5841 100644 (file)
--- a/mcs/errors/Makefile
+++ b/mcs/errors/Makefile
@@ -2,39 +2,48 @@ thisdir = errors
 SUBDIRS = 
 include ../build/rules.make
 
+with_mono_path = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
+with_mono_path_n11b = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
+
 ifeq (default, $(PROFILE))
 # force this, we don't case if CSC is broken. This also
 # means we can use --options, yay.
 
-MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_MCS)
+MCS = $(with_mono_path) $(INTERNAL_MCS)
+else
+EXTRA_SUPPORT_FILES = CSFriendAssembly-lib.dll GCS0730-lib.dll GCS0733-lib.dll
 endif
 
-GENERICS_COMPILE = $(CSCOMPILE) /target:library
+ilasm = $(topdir)/class/lib/net_1_1_bootstrap/ilasm.exe
+ILASM = $(with_mono_path_n11b) $(RUNTIME) $(RUNTIME_FLAGS) $(ilasm)
 
-RUNTEST_PL = ./runtest.pl
+GENERICS_COMPILE = $(CSCOMPILE) /target:library
 
 DISTFILES = \
        CONTRIBUTORS_README     \
-       README.tests            \
        errors.txt              \
-       fail                    \
-       runtest.pl              \
        do-tests.pl             \
        $(wildcard *.cs)        \
+       $(wildcard *.il)        \
        $(wildcard *.inc)       \
        $(wildcard *.pub)       \
+       $(wildcard *.snk)       \
        $(wildcard *.response)  \
-       mcs-expect-no-error mcs-expect-wrong-error mcs-ignore-tests \
-       gmcs-expect-no-error gmcs-expect-wrong-error gmcs-ignore-tests \
-       generics-expect-no-error generics-expect-wrong-error \\r
-       TestRunner.exe know-issues-*
+       $(wildcard known-issues-*)
 
-#all-local: run-test-local test-multi-local
-all-local: CS0118-2-lib.dll CS0122-10-lib.dll CS0534-3-lib.dll CS0534-4-lib.dll CS0571-3-lib.dll \
-       CS0612-2-lib.dll CS0618-2-lib.dll CS0619-8-lib.dll CS0619-17-lib.dll CS0619-32-lib.dll CS0619-33-lib.dll CS0619-36-lib.dll \
-       CS3005-16-lib.dll CS3013-module.dll
+TEST_SUPPORT_FILES = \
+       CS0118-2-lib.dll CS0122-10-lib.dll CS0122-14-lib.dll CS0122-15-lib.dll CS0122-19-lib.dll CS0144-3-lib.dll \
+       CS0205-3-lib.dll \
+       CS0229-3-lib.dll CS0229-4-lib.dll \
+       CS0433-lib.dll CS0433-2-lib.dll \
+       CS0534-3-lib.dll CS0534-4-lib.dll CS0571-3-lib.dll \
+       CS0612-2-lib.dll CS0618-2-lib.dll CS0619-8-lib.dll CS0619-17-lib.dll CS0619-32-lib.dll CS0619-33-lib.dll CS0619-36-lib.dll CS0619-42-lib.dll \
+       CS0619-43-lib.dll CS1546-lib.dll CS0619-51-lib.dll CS2015-lib.dll CS3005-16-lib.dll CS3013-module.dll CSExternAlias-lib.dll \
+       $(EXTRA_SUPPORT_FILES) 
 
-test-local: TestRunner.exe
+all-local:
+
+test-local: $(TEST_SUPPORT_FILES)
 
 run-test-ondotnet-local:
 
@@ -43,47 +52,24 @@ run-test-ondotnet-local:
 
 run-test-local: run-mcs-tests 
 
-TEST_PROFILE=mcs
+test-everything:
+       $(MAKE) PROFILE=default run-test
+       $(MAKE) PROFILE=net_2_0 run-test
 
 ifeq (net_2_0, $(PROFILE))
-TEST_PROFILE=gmcs
-run-test-local: run-generics-tests
+COMPILER_NAME = gmcs
+COMPILER = $(topdir)/class/lib/$(PROFILE)/gmcs.exe
+TEST_PATTERN = '*cs*.cs'
+else
+COMPILER_NAME = mcs
+COMPILER = $(topdir)/class/lib/$(PROFILE)/mcs.exe
+TEST_PATTERN = 'cs*.cs'
 endif
 
-test-everything:
-       $(MAKE) PROFILE=default run-test
-       $(MAKE) PROFILE=net_2_0 run-test
+run-mcs-tests: $(TEST_SUPPORT_FILES)
 
-run-mcs-tests:\r
-       $(RUNTIME) TestRunner.exe '.' $(topdir)/class/lib/$(PROFILE)/mcs.exe know-issues-mcs
-
-run-generics-tests:\r
-       -rm -f generics.log
-       @./do-tests.pl generics '$(GENERICS_COMPILE)' "gcs*.cs"
-
-test-multi-local:
-       @ failed=false; \
-       testsuite_log=test-multi.log; rm -f $$testsuite_log ; \
-       for i in error-*.cs; do \
-               test_out=`echo $$i | sed 's,.cs$$,.out,'` ; \
-               test_log=`echo $$i | sed 's,.cs$$,.log,'` ; \
-               echo -n "Running test $$i ... "; \
-               $(CSCOMPILE) $$i > $$test_out 2>&1 || : ; \
-               if $(RUNTEST_PL) $$i $$test_out > $$test_log 2>&1 ; \
-               then echo OK; rm -f $$test_out $$test_log ; \
-                    echo "PASS: $$i" >> $$testsuite_log ; \
-               else echo FAILED; \
-                    echo "FAIL: $$i" >> $$testsuite_log ; \
-                    flist="$$flist $$i"; \
-                    failed=true; \
-               fi; \
-       done; \
-       if $$failed; then \
-               echo "The following tests failed: $$flist"; \
-               exit 1; \
-       else \
-               echo All tests passed; \
-       fi
+run-mcs-tests:
+       MONO_RUNTIME='$(RUNTIME)' $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/compiler-tester.exe negative 0 $(COMPILER) known-issues-$(COMPILER_NAME) $(COMPILER_NAME).log
 
 clean-local:
        rm -f *.exe *.dll *.log *.mdb dummy.xml *.junk
@@ -93,10 +79,10 @@ dist-local: dist-default
 install-local uninstall-local:
 
 %-lib.dll: %-lib.cs
-       $(BOOTSTRAP_MCS) /target:library /out:$@ $<
+       $(CSCOMPILE) /target:library /out:$@ $<
 
 %-module.dll: %-module.cs
-       $(BOOTSTRAP_MCS) /target:module /out:$@ $<
-\r
-TestRunner.exe:\r
-       $(CSCOMPILE) TestRunner.cs
\ No newline at end of file
+       $(CSCOMPILE) /target:module /out:$@ $<
+
+%-lib.dll: %-lib.il
+       $(ILASM) /dll /out:$@ $<