Update mcs error to test against mcs compiler

diff --git a/mcs/.gitignore b/mcs/.gitignore
index 69e1f348094bb832778b78f3fc1a4e360413eaa3..2c70c866ea31c864c9b564c32ad06d19151f6eb5 100644 (file)
--- a/mcs/.gitignore
+++ b/mcs/.gitignore
@@ -7,9 +7,9 @@
 TestResult-*.log
 TestResult-*.xml
 TestResult*.xml
-errors/?mcs.log
+errors/*.log
 errors/dummy.xml
-tests/?mcs.log
+tests/*.log
 tests/gtest-*.dll
 tests/test-*.dll
 tests/xml-*.xml

diff --git a/mcs/errors/CS0012-12-lib.il b/mcs/errors/CS0012-12-lib.il
index 6a5e7552e23a4e9499100a6648cb4e7b23328a2e..aac46788724544263852669869f926a813ad0c81 100644 (file)
--- a/mcs/errors/CS0012-12-lib.il
+++ b/mcs/errors/CS0012-12-lib.il
@@ -15,14 +15,14 @@
 .module 'CS0012-12-lib.dll'
 
 .class public auto ansi beforefieldinit Lib1.Class1`1<T>
-       extends class ['cs0012-12-missing']Lib2.Class1`1<class ['cs0012-12-missing']Lib2.Class2>
+       extends class ['CS0012-lib-missing']Lib2.Class1`1<class ['CS0012-lib-missing']Lib2.Class2>
 {
   .method public hidebysig specialname rtspecialname 
           instance void  .ctor() cil managed
   {
     IL_0000:  ldarg.0
-    IL_0001:  call       instance void class ['cs0012-12-missing']Lib2.Class1`1<class ['cs0012-12-missing']Lib2.Class2>::.ctor()
+    IL_0001:  call       instance void class ['CS0012-lib-missing']Lib2.Class1`1<class ['CS0012-lib-missing']Lib2.Class2>::.ctor()
     IL_0006:  ret
   }
 
-}
\ No newline at end of file
+}

diff --git a/mcs/errors/Makefile b/mcs/errors/Makefile
index 35bb805a68d71d9ef9f40cb32b3dd16d6bc5c85f..894851293dcdbbe21ce7a77379b09a8f8d72e09d 100644 (file)
--- a/mcs/errors/Makefile
+++ b/mcs/errors/Makefile
@@ -56,28 +56,21 @@ test-local:
 run-test-local: clean-local
        $(MAKE) run-mcs-tests
 
+TEST_PATTERN = 'v2'
+
+# Required to test parser correctly
+TESTER_OPTIONS =-compiler-options:-v
+
 ifeq (net_4_0, $(PROFILE))
-COMPILER_NAME = dmcs
 TEST_PATTERN = 'v4'
-endif
-ifeq (moonlight, $(PROFILE))
-COMPILER_NAME = smcs
-TEST_PATTERN = 'v2'
-LOCAL_RUNTIME_FLAGS = --security=temporary-smcs-hack
-endif
-ifeq (net_2_0, $(PROFILE))
-COMPILER_NAME = gmcs
-TEST_PATTERN = 'v2'
+TESTER_OPTIONS = -compiler-options:"-v -d:NET_4_0 -sdk:4"
 endif
 
-COMPILER = $(topdir)/class/lib/$(PROFILE)/$(COMPILER_NAME).exe
+COMPILER = $(topdir)/class/lib/basic/mcs.exe
 TESTER = MONO_RUNTIME='$(RUNTIME)' $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(LOCAL_RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/compiler-tester.exe
 
-# Required to test parser correctly
-TESTER_OPTIONS +=-compiler-options:-v
-
 run-mcs-tests: $(TEST_SUPPORT_FILES)
-       $(TESTER) -mode:neg -files:$(TEST_PATTERN) -compiler:$(COMPILER) -issues:known-issues-$(COMPILER_NAME) -log:$(COMPILER_NAME).log $(TESTER_OPTIONS)
+       $(TESTER) -mode:neg -files:$(TEST_PATTERN) -compiler:$(COMPILER) -issues:known-issues-$(PROFILE) -log:$(PROFILE).log $(TESTER_OPTIONS) $(TOPTIONS)
 
 endif
 

diff --git a/mcs/errors/cs0012-12.cs b/mcs/errors/cs0012-12.cs
index a1c34a07a623412e4bebfc7da5453a0122e6a68f..eae1aeb79aa8340a79c4fb90a681f2a438b08de0 100644 (file)
--- a/mcs/errors/cs0012-12.cs
+++ b/mcs/errors/cs0012-12.cs
@@ -1,4 +1,4 @@
-// CS0012: The type `Lib2.Class1`1<Lib2.Class2>' is defined in an assembly that is not referenced. Consider adding a reference to assembly `cs0012-12-missing, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null'
+// CS0012: The type `Lib2.Class1`1<Lib2.Class2>' is defined in an assembly that is not referenced. Consider adding a reference to assembly `CS0012-lib-missing, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null'
 // Line: 5
 // Compiler options: -r:CS0012-12-lib.dll
 

diff --git a/mcs/errors/known-issues-dmcs b/mcs/errors/known-issues-dmcs
deleted file mode 100644 (file)
index 4466c6d..0000000
--- a/mcs/errors/known-issues-dmcs
+++ /dev/null
@@ -1,57 +0,0 @@
-# These files are give the wrong warning when compiled.
-# If you add a new test that should generate an error but generates the
-# wrong one, it should be added here.
-
-# If you fix the compiler so that it emits the correct error,
-# the file should be removed.
-
-# This file supports extended syntax
-# csXXXX.cs            : error test case reports wrong error
-# csXXXX.cs IGNORE     : adds test to ignore list (should ONLY be used if the runtime crashes)
-# csXXXX.cs NO ERROR   : error test case doesn't report any error. An exception is considered
-#                        as NO ERROR and CS5001 is automatically ignored.
-
-cs0162-7.cs NO ERROR
-
-# Operators
-cs0457-2.cs
-cs0457.cs
-
-cs1540-6.cs NO ERROR
-
-dcs0165.cs NO ERROR # Bug 593369
-
-# all the following are from bug #628673
-cs0122-35.cs
-cs0012.cs
-cs0012-2.cs
-cs0012-3.cs NO ERROR
-cs0012-4.cs NO ERROR
-cs0012-5.cs NO ERROR
-cs0012-6.cs
-cs0012-7.cs
-cs0012-8.cs
-cs0012-9.cs
-cs0012-10.cs
-dcs1979.cs
-cs0023-11.cs
-cs0111-3.cs
-cs0122-19.cs
-cs0122-28.cs
-cs0122-8.cs
-cs0168-2.cs
-cs0177-8.cs NO ERROR
-cs0307-6.cs
-cs0308-7.cs
-cs0315.cs NO ERROR
-cs0520.cs
-cs1509.cs
-cs1542.cs NO ERROR
-cs1574-3.cs NO ERROR
-cs1574-6.cs NO ERROR
-cs1574-8.cs NO ERROR
-cs1581-2.cs
-cs1581.cs
-cs1584.cs
-cs1612-6.cs NO ERROR
-cs3006-7.cs NO ERROR

diff --git a/mcs/errors/known-issues-gmcs b/mcs/errors/known-issues-gmcs
deleted file mode 100644 (file)
index dd2ce29..0000000
--- a/mcs/errors/known-issues-gmcs
+++ /dev/null
@@ -1,60 +0,0 @@
-# These files are give the wrong warning when compiled.
-# If you add a new test that should generate an error but generates the
-# wrong one, it should be added here.
-
-# If you fix the compiler so that it emits the correct error,
-# the file should be removed.
-
-# This file supports extended syntax
-# csXXXX.cs            : error test case reports wrong error
-# csXXXX.cs IGNORE     : adds test to ignore list (should ONLY be used if the runtime crashes)
-# csXXXX.cs NO ERROR   : error test case doesn't report any error. An exception is considered
-#                        as NO ERROR and CS5001 is automatically ignored.
-
-cs0162-7.cs NO ERROR
-
-# Operators
-cs0457-2.cs
-cs0457.cs
-
-cs1540-6.cs NO ERROR Is it real error
-
-# all the following are from bug #628673
-cs0122-35.cs
-cs0012.cs
-cs0012-2.cs
-cs0012-3.cs NO ERROR
-cs0012-4.cs NO ERROR
-cs0012-5.cs NO ERROR
-cs0012-6.cs
-cs0012-7.cs
-cs0012-8.cs
-cs0012-9.cs
-cs0012-10.cs
-cs0012-11.cs
-cs0023-11.cs
-cs0111-3.cs
-cs0122-19.cs
-cs0122-28.cs
-cs0122-8.cs
-cs0168-2.cs
-cs0177-8.cs NO ERROR
-cs0307-6.cs
-cs0308-7.cs
-cs0315.cs NO ERROR
-cs0520.cs
-cs1509.cs
-cs1542.cs NO ERROR
-cs1574-3.cs NO ERROR
-cs1574-6.cs NO ERROR
-cs1574-8.cs NO ERROR
-cs1581-2.cs
-cs1581.cs
-cs1584.cs
-cs1612-6.cs NO ERROR
-cs1701.cs
-cs1702.cs
-cs1703.cs NO ERROR
-cs1704.cs NO ERROR
-cs1705.cs
-cs3006-7.cs NO ERROR

diff --git a/mcs/errors/known-issues-net_2_0 b/mcs/errors/known-issues-net_2_0
new file mode 100644 (file)
index 0000000..dd2ce29
--- /dev/null
+++ b/mcs/errors/known-issues-net_2_0
@@ -0,0 +1,60 @@
+# These files are give the wrong warning when compiled.
+# If you add a new test that should generate an error but generates the
+# wrong one, it should be added here.
+
+# If you fix the compiler so that it emits the correct error,
+# the file should be removed.
+
+# This file supports extended syntax
+# csXXXX.cs            : error test case reports wrong error
+# csXXXX.cs IGNORE     : adds test to ignore list (should ONLY be used if the runtime crashes)
+# csXXXX.cs NO ERROR   : error test case doesn't report any error. An exception is considered
+#                        as NO ERROR and CS5001 is automatically ignored.
+
+cs0162-7.cs NO ERROR
+
+# Operators
+cs0457-2.cs
+cs0457.cs
+
+cs1540-6.cs NO ERROR Is it real error
+
+# all the following are from bug #628673
+cs0122-35.cs
+cs0012.cs
+cs0012-2.cs
+cs0012-3.cs NO ERROR
+cs0012-4.cs NO ERROR
+cs0012-5.cs NO ERROR
+cs0012-6.cs
+cs0012-7.cs
+cs0012-8.cs
+cs0012-9.cs
+cs0012-10.cs
+cs0012-11.cs
+cs0023-11.cs
+cs0111-3.cs
+cs0122-19.cs
+cs0122-28.cs
+cs0122-8.cs
+cs0168-2.cs
+cs0177-8.cs NO ERROR
+cs0307-6.cs
+cs0308-7.cs
+cs0315.cs NO ERROR
+cs0520.cs
+cs1509.cs
+cs1542.cs NO ERROR
+cs1574-3.cs NO ERROR
+cs1574-6.cs NO ERROR
+cs1574-8.cs NO ERROR
+cs1581-2.cs
+cs1581.cs
+cs1584.cs
+cs1612-6.cs NO ERROR
+cs1701.cs
+cs1702.cs
+cs1703.cs NO ERROR
+cs1704.cs NO ERROR
+cs1705.cs
+cs3006-7.cs NO ERROR

diff --git a/mcs/errors/known-issues-net_4_0 b/mcs/errors/known-issues-net_4_0
new file mode 100644 (file)
index 0000000..4466c6d
--- /dev/null
+++ b/mcs/errors/known-issues-net_4_0
@@ -0,0 +1,57 @@
+# These files are give the wrong warning when compiled.
+# If you add a new test that should generate an error but generates the
+# wrong one, it should be added here.
+
+# If you fix the compiler so that it emits the correct error,
+# the file should be removed.
+
+# This file supports extended syntax
+# csXXXX.cs            : error test case reports wrong error
+# csXXXX.cs IGNORE     : adds test to ignore list (should ONLY be used if the runtime crashes)
+# csXXXX.cs NO ERROR   : error test case doesn't report any error. An exception is considered
+#                        as NO ERROR and CS5001 is automatically ignored.
+
+cs0162-7.cs NO ERROR
+
+# Operators
+cs0457-2.cs
+cs0457.cs
+
+cs1540-6.cs NO ERROR
+
+dcs0165.cs NO ERROR # Bug 593369
+
+# all the following are from bug #628673
+cs0122-35.cs
+cs0012.cs
+cs0012-2.cs
+cs0012-3.cs NO ERROR
+cs0012-4.cs NO ERROR
+cs0012-5.cs NO ERROR
+cs0012-6.cs
+cs0012-7.cs
+cs0012-8.cs
+cs0012-9.cs
+cs0012-10.cs
+dcs1979.cs
+cs0023-11.cs
+cs0111-3.cs
+cs0122-19.cs
+cs0122-28.cs
+cs0122-8.cs
+cs0168-2.cs
+cs0177-8.cs NO ERROR
+cs0307-6.cs
+cs0308-7.cs
+cs0315.cs NO ERROR
+cs0520.cs
+cs1509.cs
+cs1542.cs NO ERROR
+cs1574-3.cs NO ERROR
+cs1574-6.cs NO ERROR
+cs1574-8.cs NO ERROR
+cs1581-2.cs
+cs1581.cs
+cs1584.cs
+cs1612-6.cs NO ERROR
+cs3006-7.cs NO ERROR

diff --git a/mcs/errors/known-issues-smcs b/mcs/errors/known-issues-smcs
deleted file mode 100644 (file)
index 3ad5e30..0000000
--- a/mcs/errors/known-issues-smcs
+++ /dev/null
@@ -1,134 +0,0 @@
-cs0029-7.cs
-cs0109-7.cs
-cs0120-8.cs
-cs0131-3.cs
-cs0136-6.cs
-cs0158-5.cs
-cs0160.cs NO ERROR
-cs0162-7.cs NO ERROR
-cs0165-10.cs
-cs0165-11.cs
-cs0187-2.cs
-cs0197.cs
-cs0266-15.cs
-cs0266-3.cs
-cs0419-2.cs NO ERROR
-cs0419-3.cs NO ERROR
-cs0419-4.cs NO ERROR
-cs0419.cs NO ERROR
-cs0457-2.cs
-cs0457.cs
-cs0610.cs
-cs0611.cs
-cs0619-42.cs
-cs0647-14.cs
-cs0647-3.cs
-cs0647-4.cs
-cs0647-5.cs
-cs0647-6.cs
-cs0647-7.cs
-cs0647-9.cs
-cs0714-2.cs
-cs0737-2.cs
-cs0737.cs
-cs1041.cs # new in GMCS; grammar issue
-cs1502-2.cs
-cs1533.cs IGNORE
-cs1570-10.cs NO ERROR
-cs1570-11.cs NO ERROR
-cs1570-12.cs NO ERROR
-cs1570-2.cs NO ERROR
-cs1570-3.cs NO ERROR
-cs1570-4.cs NO ERROR
-cs1570-5.cs NO ERROR
-cs1570-6.cs NO ERROR
-cs1570-7.cs NO ERROR
-cs1570-8.cs NO ERROR
-cs1570-9.cs NO ERROR
-cs1570.cs NO ERROR
-cs1571.cs NO ERROR
-cs1572.cs NO ERROR
-cs1573.cs NO ERROR
-cs1574-2.cs NO ERROR
-cs1574-3.cs NO ERROR
-cs1574-4.cs NO ERROR
-cs1574-5.cs NO ERROR
-cs1574-6.cs NO ERROR
-cs1574-7.cs NO ERROR
-cs1574-8.cs NO ERROR
-cs1574-9.cs NO ERROR
-cs1574.cs NO ERROR
-cs1580-2.cs NO ERROR
-cs1580.cs NO ERROR
-cs1581-2.cs NO ERROR
-cs1581.cs NO ERROR
-cs1584-2.cs NO ERROR
-cs1584-3.cs NO ERROR
-cs1584-4.cs NO ERROR
-cs1584.cs NO ERROR
-cs1589.cs NO ERROR
-cs1590-2.cs NO ERROR
-cs1590-3.cs NO ERROR
-cs1590.cs NO ERROR
-cs1591-10.cs NO ERROR
-cs1591-11.cs NO ERROR
-cs1591-12.cs NO ERROR
-cs1591-13.cs NO ERROR
-cs1591-14.cs NO ERROR
-cs1591-15.cs NO ERROR
-cs1591-16.cs NO ERROR
-cs1591-17.cs NO ERROR
-cs1591-18.cs NO ERROR
-cs1591-19.cs NO ERROR
-cs1591-2.cs NO ERROR
-cs1591-3.cs NO ERROR
-cs1591-4.cs NO ERROR
-cs1591-5.cs NO ERROR
-cs1591-6.cs NO ERROR
-cs1591-7.cs NO ERROR
-cs1591-8.cs NO ERROR
-cs1591-9.cs
-cs1591.cs NO ERROR
-cs1592.cs NO ERROR
-cs1599-2.cs
-cs1599-3.cs
-cs1601-2.cs
-cs1608.cs
-cs1624.cs
-cs1685.cs
-cs1690-2.cs
-cs1690-3.cs
-cs1690-4.cs
-cs1690-5.cs
-cs1690-6.cs
-cs1690-7.cs
-cs1690.cs
-cs3002-9.cs
-cs3008-7.cs
-cs3009-2.cs
-cs3010.cs
-gcs0030.cs
-gcs0306-3.cs
-gcs0729.cs
-gcs0730.cs
-gcs0733.cs
-gcs0735-2.cs
-gcs0735.cs
-gcs0739.cs
-gcs0747-2.cs
-gcs0747.cs
-gcs1061-6.cs
-gcs1685.cs
-gcs1686.cs
-gcs1708.cs
-gcs1908-2.cs
-gcs1908-3.cs
-gcs1908-4.cs
-gcs1908.cs
-gcs1909-2.cs
-gcs1909.cs
-gcs1910-2.cs
-gcs1910.cs
-gcs1922-2.cs
-cs1540-6.cs
-cs1540-9.cs

diff --git a/mcs/tests/Makefile b/mcs/tests/Makefile
index 26699209366c44efc66edabadfc21e6c00d7f29f..a6bbd77c03297e7dadabb135b540788d773a3b19 100644 (file)
--- a/mcs/tests/Makefile
+++ b/mcs/tests/Makefile
@@ -61,7 +61,7 @@ build-compiler-lib:
        cd ../class/Mono.CSharp && $(MAKE) NO_DIR_CHECK=yes
 
 qcheck: build-compiler-lib
-       $(TESTER) -mode:pos -files:$(TEST_PATTERN) -compiler:$(COMPILER) -issues:known-issues-$(PROFILE) -log:$(COMPILER_NAME).log -il:ver-il-$(PROFILE).xml $(DEFINES) $(TOPTIONS)
+       $(TESTER) -mode:pos -files:$(TEST_PATTERN) -compiler:$(COMPILER) -issues:known-issues-$(PROFILE) -log:$(PROFILE).log -il:ver-il-$(PROFILE).xml $(DEFINES) $(TOPTIONS)
 
 test-local:
        @: