* AssemblyNameTest.cs: Added tests for Clone and serialization without

[mono.git] / mcs / errors / Makefile

diff --git a/mcs/errors/Makefile b/mcs/errors/Makefile
index ccb4e723e9fff56bd42c8a1e509bb8f1fa852d9e..eab04d78e48e7cc39188d4150436326119838c2f 100644 (file)
--- a/mcs/errors/Makefile
+++ b/mcs/errors/Makefile
@@ -2,23 +2,21 @@ thisdir = errors
 SUBDIRS = 
 include ../build/rules.make
 
+with_mono_path = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(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)
 endif
 
 GENERICS_COMPILE = $(CSCOMPILE) /target:library
 
-RUNTEST_PL = ./runtest.pl
-
 DISTFILES = \
        CONTRIBUTORS_README     \
        README.tests            \
        errors.txt              \
-       fail                    \
-       runtest.pl              \
        do-tests.pl             \
        $(wildcard *.cs)        \
        $(wildcard *.inc)       \
@@ -26,14 +24,14 @@ DISTFILES = \
        $(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
+       generics-expect-no-error generics-expect-wrong-error \
+       $(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-local:
+test-local: TestRunner-$(PROFILE).exe
 
 run-test-ondotnet-local:
 
@@ -42,48 +40,30 @@ run-test-ondotnet-local:
 
 run-test-local: run-mcs-tests 
 
-TEST_PROFILE=mcs
-
-ifeq (net_2_0, $(PROFILE))
-TEST_PROFILE=gmcs
-run-test-local: run-generics-tests
-endif
-
 test-everything:
        $(MAKE) PROFILE=default run-test
        $(MAKE) PROFILE=net_2_0 run-test
 
-run-mcs-tests:
-       -rm -f $(TEST_PROFILE).log
-       @./do-tests.pl $(TEST_PROFILE) '$(CSCOMPILE)' "cs*.cs"
+ifeq (net_2_0, $(PROFILE))
+COMPILER_NAME = gmcs
+COMPILER = $(topdir)/gmcs/gmcs.exe
+TEST_PATTERN = '*cs*.cs'
+else
+COMPILER_NAME = mcs
+COMPILER = $(topdir)/class/lib/$(PROFILE)/mcs.exe
+TEST_PATTERN = 'cs*.cs'
+endif
 
-run-generics-tests:
+ifeq (net_2_0, $(PROFILE))
+run-mcs-tests:
+       -rm -f gmcs.log
+       @./do-tests.pl gmcs '$(CSCOMPILE)' "cs*.cs"
        -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
+else
+run-mcs-tests: TestRunner-$(PROFILE).exe
+       $(with_mono_path) $(RUNTIME) TestRunner-$(PROFILE).exe $(COMPILER_NAME) $(COMPILER) known-issues-$(COMPILER_NAME) $(COMPILER_NAME).log
+endif
 
 clean-local:
        rm -f *.exe *.dll *.log *.mdb dummy.xml *.junk
@@ -97,3 +77,6 @@ install-local uninstall-local:
 
 %-module.dll: %-module.cs
        $(BOOTSTRAP_MCS) /target:module /out:$@ $<
+
+TestRunner-$(PROFILE).exe: TestRunner.cs
+       $(CSCOMPILE) /out:$@ TestRunner.cs