3 more tests pass now

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

diff --git a/mcs/tests/ChangeLog b/mcs/tests/ChangeLog
index 5e08ffbbe6e1a717be93a9ebcd7d3830f86b0274..7af464e8ee4bb74571d96280ceca47d04fbcaf05 100755 (executable)
--- a/mcs/tests/ChangeLog
+++ b/mcs/tests/ChangeLog
@@ -1,3 +1,11 @@
+2001-12-13  Miguel de Icaza  <miguel@ximian.com>
+
+       * makefile (test-30): Another test moved to the `pass' section.
+       This is explicit interface implementation.
+
+       (test-54): returning from catch exceptions has been working for
+       some time now. 
+
 2001-12-09  Radek Doulik  <rodo@ximian.com>
 
        * makefile (TEST_SOURCES): added test-55 for using alias directive

diff --git a/mcs/tests/makefile b/mcs/tests/makefile
index faa4c89a32ed30f5b8b926133c443103cf5f7553..4ec06fdb0ce4678215b9a6402db871b2115064c4 100755 (executable)
--- a/mcs/tests/makefile
+++ b/mcs/tests/makefile
@@ -7,16 +7,14 @@ VERIFY=../tools/verifier.exe
 TEST_SOURCES = \
        test-1  test-2  test-3  test-4  test-5  test-6  test-7  test-8  test-9  test-10 \
        test-11 test-12 test-13 test-14 test-15 test-16 test-17 test-18 test-19 test-20 \
-       test-21 test-22 test-23 test-24 test-25 test-26 test-27 test-28                 \
+       test-21 test-22 test-23 test-24 test-25 test-26 test-27 test-28         test-30 \
        test-31 test-32 test-33 test-34 test-35 test-36 test-37         test-39 test-40 \
        test-41 test-42 test-43 test-44 test-45 test-46 test-47 test-48 test-49 test-50 \
-                       test-53         test-55
+                       test-53 test-54 test-55
 
 
-# NOTE ON TEST-54.  Do not remove it, it compiles but does not pass peverify
 TEST_NOPASS = \
-       test-29 test-30 test-38 test-52 test-54
-#################  Details on why test-54 does not pass are on TODO file.
+       test-29 test-38 test-52 
 
 
 

diff --git a/mcs/tests/test-30.cs b/mcs/tests/test-30.cs
index ba93dae1fce3d4f965aefdd501d7eeaa1994216f..56c8308c02b914f60ea5be8367adccf214700b29 100644 (file)
--- a/mcs/tests/test-30.cs
+++ b/mcs/tests/test-30.cs
@@ -39,10 +39,21 @@ class test {
 
                if (x.ib_called)
                        return 1;
-               if (x.ia_called)
-                       return 0;
+               if (!x.ia_called)
+                       return 2;
 
-               return 1;
+               X y = new X ();
+               ((IB) y).Draw ();
+               Console.WriteLine ("IA: " + x.ia_called);
+               Console.WriteLine ("IB: " + x.ib_called);
+
+               if (!y.ib_called)
+                       return 3;
+               if (y.ia_called)
+                       return 4;
+
+               Console.WriteLine ("All tests pass");
+               return 0;
        }
 }
 

diff --git a/mcs/tests/test-53.cs b/mcs/tests/test-53.cs
index dd38c299716486056c95fc8070ea84a4ad7e3da3..34cdd0c2f9473f04ea4e6013a6f6b95ba72b7461 100755 (executable)
--- a/mcs/tests/test-53.cs
+++ b/mcs/tests/test-53.cs
@@ -105,11 +105,11 @@ class X {
                else
                        Console.WriteLine ("Implicit conversion from type to IDisposable pass");
 
-               MyDispose a = new MyDispose ();
-               using (a){
+               MyDispose bb = new MyDispose ();
+               using (bb){
                        
                }
-               if (a.disposed == false)
+               if (bb.disposed == false)
                        return 6;
                
                Console.WriteLine ("All tests pass");

diff --git a/mcs/tests/test-54.cs b/mcs/tests/test-54.cs
index de440d7bedacfbc078c2abff721e36c06e2a5b18..0eb5b69220467659af6badd836ef22f17077045e 100755 (executable)
--- a/mcs/tests/test-54.cs
+++ b/mcs/tests/test-54.cs
@@ -2,6 +2,7 @@
 // This test does not pass peverify because we dont return properly
 // from catch blocks
 //
+using System;
 
 class X {