* test-120.cs: Ensure we don't get falsely optimized out of the

AnsiClass check.  Also, ensure that only one of AnsiClass,
AutoClass or UnicodeClass is set.

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

diff --git a/mcs/tests/ChangeLog b/mcs/tests/ChangeLog
index 32df9ff2b359fb01110a0c8a41995301bcbe6b21..8b97c5177c313e781bbfb835b639b0967332a89c 100644 (file)
--- a/mcs/tests/ChangeLog
+++ b/mcs/tests/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-24  Raja R Harinath  <harinath@hurrynot.org>
+
+       * test-120.cs: Ensure we don't get falsely optimized out of the
+       AnsiClass check.  Also, ensure that only one of AnsiClass,
+       AutoClass or UnicodeClass is set.
+
 2008-04-07 Marek Safar <marek.safar@gmail.com>
 
        * Makefile: Enabled IL regressions check for gmcs profile.

diff --git a/mcs/tests/test-120.cs b/mcs/tests/test-120.cs
index b076ef39f1b5fce716eb47570737d6c757da166f..c525c386bb1c1d8e470afec7596f4bfb7c9267f6 100644 (file)
--- a/mcs/tests/test-120.cs
+++ b/mcs/tests/test-120.cs
@@ -34,20 +34,20 @@ class test
                int errors = 0;
                Type t = typeof (MyUnicode);
 
-               if ((t.Attributes & TypeAttributes.UnicodeClass) != TypeAttributes.UnicodeClass){
+               if ((t.Attributes & TypeAttributes.StringFormatMask) != TypeAttributes.UnicodeClass){
                        Console.WriteLine ("Class MyUnicode does not have Unicode bit set");
                        errors += 1;
                }
 
                t = typeof (MyAuto);
-               if ((t.Attributes & TypeAttributes.AutoClass) != TypeAttributes.AutoClass){
+               if ((t.Attributes & TypeAttributes.StringFormatMask) != TypeAttributes.AutoClass){
                        Console.WriteLine ("Class MyAuto does not have Auto bit set");
                        errors += 2;
                }
 
                t = typeof (MyAnsi);
 
-               if ((t.Attributes & TypeAttributes.AnsiClass) != TypeAttributes.AnsiClass){
+               if ((t.Attributes & TypeAttributes.StringFormatMask) != TypeAttributes.AnsiClass){
                        Console.WriteLine ("Class MyUnicode does not have Ansi bit set");
                        errors += 4;
                }

diff --git a/mcs/tests/ver-il-gmcs.xml b/mcs/tests/ver-il-gmcs.xml
index 248b49a04e482de99215de674426456d08926903..04c7fb952466ff15d5243df2bf6c70b6cc11c187 100644 (file)
--- a/mcs/tests/ver-il-gmcs.xml
+++ b/mcs/tests/ver-il-gmcs.xml
@@ -14888,7 +14888,7 @@
         <size>7</size>
       </method>
       <method name="Int32 Main()">
-        <size>109</size>
+        <size>140</size>
       </method>
     </type>
   </test>