2004-08-27 Martin Baulig <martin@ximian.com>

	* Makefile
	(run-gmcs-tests): New target to run the cs*.cs tests with gmcs.
	(run-generics-tests): New target to run the gcs*.cs tests.
	(run-tests-local): Run run-mcs-tests, run-gmcs-tests and
	run-generics-tests.

	* do-tests.pl: Don't return an error value if more tests pass than
	expected.

	* mcs-expect-no-error, mcs-expect-wrong-error: Updated to the
	current situation, ie. make all the tests pass.

	* gmcs-expect-no-error, gmcs-expect-wrong-error: New files.

	* generics-expect-wrong-error: Formerly known as
	gmcs-expect-wrong-error.

svn path=/trunk/mcs/; revision=32933

diff --git a/mcs/errors/.cvsignore b/mcs/errors/.cvsignore
index 4936fa48e1e3793e35ed905ac0798e04f32fbb08..4c960e3625d3656707e0b8e259091ddc75c457b9 100644 (file)
--- a/mcs/errors/.cvsignore
+++ b/mcs/errors/.cvsignore
@@ -1,3 +1,3 @@
 *.dll
 *.exe
-*.log
\ No newline at end of file
+*.log*.mdb

diff --git a/mcs/errors/ChangeLog b/mcs/errors/ChangeLog
index 30d8fe0411956198a37063f3c66ad6123bc43c67..e834697a454655b62443d4f20b9e3bb8a850eac2 100644 (file)
--- a/mcs/errors/ChangeLog
+++ b/mcs/errors/ChangeLog
@@ -1,3 +1,22 @@
+2004-08-27  Martin Baulig  <martin@ximian.com>
+
+       * Makefile
+       (run-gmcs-tests): New target to run the cs*.cs tests with gmcs.
+       (run-generics-tests): New target to run the gcs*.cs tests.
+       (run-tests-local): Run run-mcs-tests, run-gmcs-tests and
+       run-generics-tests.
+
+       * do-tests.pl: Don't return an error value if more tests pass than
+       expected.       
+
+       * mcs-expect-no-error, mcs-expect-wrong-error: Updated to the
+       current situation, ie. make all the tests pass.
+
+       * gmcs-expect-no-error, gmcs-expect-wrong-error: New files.
+
+       * generics-expect-wrong-error: Formerly known as
+       gmcs-expect-wrong-error.        
+
 2004-08-27  Martin Baulig  <martin@ximian.com>
 
        * do-tests.pl: Deal with compiler crashes.

diff --git a/mcs/errors/Makefile b/mcs/errors/Makefile
index 05f3741e4f5a4d8c262a4a21d2737eca337ea14c..bf2802a0e14f3979589a9234e7d892b85f944c27 100644 (file)
--- a/mcs/errors/Makefile
+++ b/mcs/errors/Makefile
@@ -8,7 +8,8 @@ include ../build/rules.make
 MCS = $(INTERNAL_MCS)
 LOCAL_MCS_FLAGS = /nowarn:162 --wlevel 4
 
-GMCS_COMPILE = $(RUNTIME) ../gmcs/gmcs.exe /target:library $(MCS_FLAGS)
+GMCS_COMPILE = $(RUNTIME) ../gmcs/gmcs.exe $(LOCAL_MCS_FLAGS)
+GENERICS_COMPILE = $(RUNTIME) ../gmcs/gmcs.exe $(LOCAL_MCS_FLAGS) /target:library
 
 RUNTEST_PL = ./runtest.pl
 
@@ -29,13 +30,16 @@ test-local:
 # again, run-test is when the tests actually happen, so
 # don't compile on make test.
 
-run-test-local: test-multi-local run-mcs-tests run-generics-local
+run-test-local: run-mcs-tests run-gmcs-tests run-generics-local
 
 run-mcs-tests:
        @ ./do-tests.pl mcs "$(CSCOMPILE)" "cs*.cs"
 
+run-gmcs-tests:
+       @ ./do-tests.pl gmcs "$(GMCS_COMPILE)" "cs*.cs"
+
 run-generics-local:
-       @ ./do-tests.pl gmcs "$(GMCS_COMPILE)" "gcs*.cs"
+       @ ./do-tests.pl generics "$(GENERICS_COMPILE)" "gcs*.cs"
 
 test-multi-local:
        @ failed=false; \

diff --git a/mcs/errors/do-tests.pl b/mcs/errors/do-tests.pl
index 81b01fbb72a4f6892700d3f045ca7e9e0ff1ea9d..a7b4419ef83fdecbccfca741ee10b012fc9fcc2a 100755 (executable)
--- a/mcs/errors/do-tests.pl
+++ b/mcs/errors/do-tests.pl
@@ -86,7 +86,11 @@ foreach (glob ($files)) {
        my $status;
        
        if ($exit_value > 2) {
-               $status = $RESULT_UNEXPECTED_CRASH;
+               if (exists $expecting_map {$_} and $expecting_map {$_} == $EXPECTING_WRONG_ERROR) {
+                       $status = $RESULT_EXPECTED_INCORRECT_ERROR;
+               } else {
+                       $status = $RESULT_UNEXPECTED_CRASH;
+               }
        }
        
        if ($exit_value == 0) {
@@ -138,6 +142,5 @@ print scalar @{@status_items [($RESULT_UNEXPECTED_CORRECT_ERROR   - 1)]}, " new
 exit (
        scalar @{@status_items [($RESULT_UNEXPECTED_INCORRECT_ERROR - 1)]} +
        scalar @{@status_items [($RESULT_UNEXPECTED_NO_ERROR        - 1)]} +
-       scalar @{@status_items [($RESULT_UNEXPECTED_CORRECT_ERROR   - 1)]} +
        scalar @{@status_items [($RESULT_UNEXPECTED_CRASH           - 1)]}
 ) == 0 ? 0 : 1;

diff --git a/mcs/errors/generics-expect-wrong-error b/mcs/errors/generics-expect-wrong-error
new file mode 100644 (file)
index 0000000..ff67535
--- /dev/null
+++ b/mcs/errors/generics-expect-wrong-error
@@ -0,0 +1,6 @@
+gcs0305-2.cs
+gcs0305-3.cs
+gcs0305.cs
+gcs0308-2.cs
+gcs0308-3.cs
+gcs0308.cs

diff --git a/mcs/errors/gmcs-expect-no-error b/mcs/errors/gmcs-expect-no-error
new file mode 100644 (file)
index 0000000..d28ca94
--- /dev/null
+++ b/mcs/errors/gmcs-expect-no-error
@@ -0,0 +1,27 @@
+#
+# These files are incorrectly compiled by the compiler.
+# If you add a new test that should generate an error but does not,
+# generate any, it should be added here.
+#
+# If you fix the compiler so that it correctly emits an error,
+# the file should be removed.
+#
+
+cs0111-8.cs
+cs0121-3.cs
+cs0154-2.cs
+cs0164.cs
+cs0186.cs
+cs0229.cs
+cs0246-6.cs
+cs0576.cs
+cs0580.cs
+cs0591.cs
+
+cs0160-2.cs #64222
+cs0173-2.cs #64223
+cs0571-2.cs #64224
+cs0647-3.cs #64225
+cs1017.cs   #64226
+
+cs0111-8.cs

diff --git a/mcs/errors/gmcs-expect-wrong-error b/mcs/errors/gmcs-expect-wrong-error
index ff67535d21cf785f7a03d54a611ef8717d8da8d3..9fb2b6812a5dca5390f84209178185d376586f29 100644 (file)
--- a/mcs/errors/gmcs-expect-wrong-error
+++ b/mcs/errors/gmcs-expect-wrong-error
@@ -1,6 +1,168 @@
-gcs0305-2.cs
-gcs0305-3.cs
-gcs0305.cs
-gcs0308-2.cs
-gcs0308-3.cs
-gcs0308.cs
+#
+# 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.
+#
+
+cs-11.cs
+cs0012.cs
+cs0029.cs
+cs0029-3.cs
+cs0035.cs
+cs0038-1.cs
+cs0065.cs
+cs0069.cs
+cs0079.cs
+cs0108-2.cs
+cs0111-2.cs
+cs0111-3.cs
+cs0111-4.cs
+cs0116-2.cs
+cs0118.cs
+cs0122-2.cs
+cs0128.cs
+cs0143.cs
+cs0149.cs
+cs0173.cs
+cs0173-2.cs
+cs0186-2.cs
+cs0192.cs
+cs0198.cs
+cs0199.cs
+cs0200.cs
+cs0201.cs
+cs0202.cs
+cs0217.cs
+cs0229-2.cs
+cs0230.cs
+cs0231.cs
+cs0234.cs
+cs0239.cs
+cs0241.cs
+cs0244.cs
+cs0245.cs
+cs0248.cs
+cs0249.cs
+cs0250.cs
+cs0428.cs
+cs0504.cs
+cs0505.cs
+cs0516.cs
+cs0524.cs
+cs0525.cs
+cs0526.cs
+cs0529.cs
+cs0531.cs
+cs0533.cs
+cs0541.cs
+cs0544.cs
+cs0545.cs
+cs0546.cs
+cs0547-2.cs
+cs0547.cs
+cs0548.cs
+cs0550.cs
+cs0551.cs
+cs0557.cs
+cs0558.cs
+cs0559.cs
+cs0560.cs
+cs0561.cs
+cs0564.cs
+cs0567.cs
+cs0590.cs
+cs0610.cs
+cs0611-2.cs
+cs0611.cs
+cs0654.cs
+cs0676.cs
+cs1001.cs
+cs1513.cs
+cs1518.cs
+cs1525.cs
+cs1528.cs
+cs1552.cs
+cs1593-2.cs
+cs1662.cs
+cs1676.cs
+cs1678.cs
+cs2007.cs
+cs2007.cs
+cs8200.cs
+cs8201.cs
+cs8202.cs
+cs8203.cs
+cs8204.cs
+cs8205.cs
+cs8206.cs
+cs8207.cs
+cs8208.cs
+cs8209.cs
+cs8210.cs
+cs8213.cs
+cs8214.cs
+cs8217.cs
+
+cs0182-2.cs #64221
+
+cs0066-2.cs
+cs0102-10.cs
+cs0108-3.cs
+cs0111-10.cs
+cs0111-9.cs
+cs0117-4.cs
+cs0119.cs
+cs0162.cs
+cs0192-2.cs
+cs0214-4.cs
+cs0214-5.cs
+cs0251.cs
+cs0257.cs
+cs0448.cs
+cs0509.cs
+cs0524-2.cs
+cs0524-3.cs
+cs0524-4.cs
+cs0524-5.cs
+cs0525-2.cs
+cs0531-2.cs
+cs0548-2.cs
+cs0548-3.cs
+cs0548-4.cs
+cs0564-2.cs
+cs0590-2.cs
+cs0610-3.cs
+cs0620-2.cs
+cs0620.cs
+cs0622.cs
+cs0631.cs
+cs0636-2.cs
+cs0637-2.cs
+cs0637.cs
+cs0641.cs
+cs0647-2.cs
+cs0650.cs
+cs0652.cs
+cs0653.cs
+cs0674.cs
+cs0681.cs
+cs0685.cs
+cs1013.cs
+cs1016.cs
+cs1031.cs
+cs1035.cs
+cs1040.cs
+cs1055.cs
+cs1501-5.cs
+cs1501.cs
+cs1547-3.cs
+cs1547-4.cs
+cs1575.cs
+cs1605.cs
+cs1611.cs
+cs1677.cs
+cs2023.cs
+cs3005-19.cs

diff --git a/mcs/errors/mcs-expect-no-error b/mcs/errors/mcs-expect-no-error
index 3f694f0d0be21ef85159626a0b890bdaf8fb2ad7..d28ca943779076da428ceb4e6718d97a901fd177 100644 (file)
--- a/mcs/errors/mcs-expect-no-error
+++ b/mcs/errors/mcs-expect-no-error
@@ -17,3 +17,11 @@ cs0246-6.cs
 cs0576.cs
 cs0580.cs
 cs0591.cs
+
+cs0160-2.cs #64222
+cs0173-2.cs #64223
+cs0571-2.cs #64224
+cs0647-3.cs #64225
+cs1017.cs   #64226
+
+cs0111-8.cs

diff --git a/mcs/errors/mcs-expect-wrong-error b/mcs/errors/mcs-expect-wrong-error
index 06ef4741d8ae66e0433bfe1968f8bc18a9ea6754..9fb2b6812a5dca5390f84209178185d376586f29 100644 (file)
--- a/mcs/errors/mcs-expect-wrong-error
+++ b/mcs/errors/mcs-expect-wrong-error
@@ -106,6 +106,63 @@ cs8213.cs
 cs8214.cs
 cs8217.cs
 
+cs0182-2.cs #64221
 
-
-
+cs0066-2.cs
+cs0102-10.cs
+cs0108-3.cs
+cs0111-10.cs
+cs0111-9.cs
+cs0117-4.cs
+cs0119.cs
+cs0162.cs
+cs0192-2.cs
+cs0214-4.cs
+cs0214-5.cs
+cs0251.cs
+cs0257.cs
+cs0448.cs
+cs0509.cs
+cs0524-2.cs
+cs0524-3.cs
+cs0524-4.cs
+cs0524-5.cs
+cs0525-2.cs
+cs0531-2.cs
+cs0548-2.cs
+cs0548-3.cs
+cs0548-4.cs
+cs0564-2.cs
+cs0590-2.cs
+cs0610-3.cs
+cs0620-2.cs
+cs0620.cs
+cs0622.cs
+cs0631.cs
+cs0636-2.cs
+cs0637-2.cs
+cs0637.cs
+cs0641.cs
+cs0647-2.cs
+cs0650.cs
+cs0652.cs
+cs0653.cs
+cs0674.cs
+cs0681.cs
+cs0685.cs
+cs1013.cs
+cs1016.cs
+cs1031.cs
+cs1035.cs
+cs1040.cs
+cs1055.cs
+cs1501-5.cs
+cs1501.cs
+cs1547-3.cs
+cs1547-4.cs
+cs1575.cs
+cs1605.cs
+cs1611.cs
+cs1677.cs
+cs2023.cs
+cs3005-19.cs