Author: kumpera
Date: 2007-07-20 18:30:46 -0400 (Fri, 20 Jul 2007)
New Revision: 82391

Added:
   trunk/mono/mono/tests/verifier/make_self_nested_test.sh
Modified:
   trunk/mono/mono/tests/verifier/ChangeLog
   trunk/mono/mono/tests/verifier/Makefile
   trunk/mono/mono/tests/verifier/make_tests.sh
Log:
2007-07-20 Rodrigo Kumpera <[EMAIL PROTECTED]>

        * make_test.sh: added more visibility tests
        * Makefile: changed again the clean target to work with the larger 
number of tests
        * make_self_nested_test.sh: new visibility tests



Modified: trunk/mono/mono/tests/verifier/ChangeLog
===================================================================
--- trunk/mono/mono/tests/verifier/ChangeLog    2007-07-20 22:17:18 UTC (rev 
82390)
+++ trunk/mono/mono/tests/verifier/ChangeLog    2007-07-20 22:30:46 UTC (rev 
82391)
@@ -1,3 +1,9 @@
+2007-07-20 Rodrigo Kumpera <[EMAIL PROTECTED]>
+
+       * make_test.sh: added more visibility tests
+       * Makefile: changed again the clean target to work with the larger 
number of tests
+       * make_self_nested_test.sh: new visibility tests
+
 2007-07-19 Rodrigo Kumpera <[EMAIL PROTECTED]>
 
        * make_test.sh: added reference compatibility tests

Modified: trunk/mono/mono/tests/verifier/Makefile
===================================================================
--- trunk/mono/mono/tests/verifier/Makefile     2007-07-20 22:17:18 UTC (rev 
82390)
+++ trunk/mono/mono/tests/verifier/Makefile     2007-07-20 22:30:46 UTC (rev 
82391)
@@ -7,8 +7,8 @@
        touch compile-stamp
 
 clean:
-       rm -f *_generated.il
-       rm -f *.exe *.dll
+       for i in *generated*; do rm $$i; done
+       for i in *.exe; do rm $$i; done
        rm generate-stamp compile-stamp
 
 generate-stamp: make_tests.sh make_bin_test.sh make_exception_branch_test.sh 
make_obj_store_test.sh \

Added: trunk/mono/mono/tests/verifier/make_self_nested_test.sh
===================================================================
--- trunk/mono/mono/tests/verifier/make_self_nested_test.sh     2007-07-20 
22:17:18 UTC (rev 82390)
+++ trunk/mono/mono/tests/verifier/make_self_nested_test.sh     2007-07-20 
22:30:46 UTC (rev 82391)
@@ -0,0 +1,80 @@
+#! /bin/sh
+
+TEST_NAME=$1
+TEST_VALIDITY=$2
+TEST_OP=$3
+TEST_CLASS_ACCESS=$4
+TEST_MEMBER_ACCESS=$5
+
+TEST_NAME=${TEST_VALIDITY}_${TEST_NAME}
+TEST_FILE=${TEST_NAME}_generated.il
+echo $TEST_FILE
+sed -e "s/VALIDITY/${TEST_VALIDITY}/g" -e "s/OPCODE/${TEST_OP}/g" -e 
"s/CLASS_ACCESS/${TEST_CLASS_ACCESS}/g" -e 
"s/MEMBER_ACCESS/${TEST_MEMBER_ACCESS}/g" > $TEST_FILE <<//EOF
+
+.assembly '${TEST_NAME}_generated'
+{
+  .hash algorithm 0x00008004
+  .ver  0:0:0:0
+}
+
+// VALIDITY CIL which breaks the ECMA-335 rules. 
+// this CIL should fail verification by a conforming CLI verifier.
+
+.assembly extern mscorlib
+{
+  .ver 1:0:5000:0
+  .publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
+}
+
+.class Outer extends [mscorlib]System.Object
+{
+       .method public hidebysig specialname rtspecialname instance default 
void .ctor () cil managed
+       {
+               .maxstack 8
+               ldarg.0 
+               call instance void object::.ctor()
+               ret
+       }
+
+       .class nested CLASS_ACCESS Inner extends [mscorlib]System.Object
+       {
+               .field MEMBER_ACCESS int32 fld
+               .field MEMBER_ACCESS static int32 sfld
+
+               .method public hidebysig specialname rtspecialname instance 
default void .ctor () cil managed
+               {
+                       .maxstack 8
+                       ldarg.0 
+                       call instance void object::.ctor()
+                       ret
+               }
+
+               .method MEMBER_ACCESS int32 Target ()
+               {
+                       .maxstack 8
+                       ldc.i4.0
+                       ret 
+               }               
+       }
+
+       .method public void Method ()
+       {
+               .maxstack 8
+
+               newobj instance void class Outer/Inner::.ctor()
+               OPCODE // VALIDITY.
+               pop
+               ret
+       }
+}
+
+.method public static int32 Main() cil managed
+{
+       .entrypoint
+       .maxstack 8
+       newobj instance void class Outer::.ctor()
+       call instance void class Outer::Method()
+       ldc.i4.0
+       ret
+}
+//EOF


Property changes on: trunk/mono/mono/tests/verifier/make_self_nested_test.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/mono/mono/tests/verifier/make_tests.sh
===================================================================
--- trunk/mono/mono/tests/verifier/make_tests.sh        2007-07-20 22:17:18 UTC 
(rev 82390)
+++ trunk/mono/mono/tests/verifier/make_tests.sh        2007-07-20 22:30:46 UTC 
(rev 82391)
@@ -1400,8 +1400,54 @@
        I=`expr $I + 1`
 done
 
+#Tests for accessing an owned nested type
+I=1
+for OP in "callvirt instance int32 class Outer\/Inner::Target()" "call 
instance int32 class Outer\/Inner::Target()" "ldc.i4.0\n\t\tstfld int32 
Outer\/Inner::fld\n\t\tldc.i4.0" "ldc.i4.0\n\t\tstsfld int32 
Outer\/Inner::sfld" "ldsfld int32 Outer\/Inner::sfld\n\n\tpop" "ldfld int32 
Outer\/Inner::fld" "ldsflda int32 Outer\/Inner::sfld\n\n\tpop" "ldflda int32 
Outer\/Inner::fld"
+do
+       ./make_self_nested_test.sh self_nested_access_check_1_${I} valid "$OP" 
public public
+       ./make_self_nested_test.sh self_nested_access_check_2_${I} unverifiable 
"$OP" public private
+       ./make_self_nested_test.sh self_nested_access_check_3_${I} unverifiable 
"$OP" public family
+       ./make_self_nested_test.sh self_nested_access_check_4_${I} valid "$OP" 
public assembly
+       ./make_self_nested_test.sh self_nested_access_check_5_${I} unverifiable 
"$OP" public famandassem
+       ./make_self_nested_test.sh self_nested_access_check_6_${I} valid "$OP" 
public famorassem
 
+       ./make_self_nested_test.sh self_nested_access_check_7_${I} valid "$OP" 
private public
+       ./make_self_nested_test.sh self_nested_access_check_8_${I} unverifiable 
"$OP" private private
+       ./make_self_nested_test.sh self_nested_access_check_9_${I} unverifiable 
"$OP" private family
+       ./make_self_nested_test.sh self_nested_access_check_10_${I} valid "$OP" 
private assembly
+       ./make_self_nested_test.sh self_nested_access_check_11_${I} 
unverifiable "$OP" private famandassem
+       ./make_self_nested_test.sh self_nested_access_check_12_${I} valid "$OP" 
private famorassem
 
+       ./make_self_nested_test.sh self_nested_access_check_13_${I} valid "$OP" 
family public
+       ./make_self_nested_test.sh self_nested_access_check_14_${I} 
unverifiable "$OP" family private
+       ./make_self_nested_test.sh self_nested_access_check_15_${I} 
unverifiable "$OP" family family
+       ./make_self_nested_test.sh self_nested_access_check_16_${I} valid "$OP" 
family assembly
+       ./make_self_nested_test.sh self_nested_access_check_17_${I} 
unverifiable "$OP" family famandassem
+       ./make_self_nested_test.sh self_nested_access_check_18_${I} valid "$OP" 
family famorassem
+
+       ./make_self_nested_test.sh self_nested_access_check_19_${I} valid "$OP" 
assembly public
+       ./make_self_nested_test.sh self_nested_access_check_20_${I} 
unverifiable "$OP" assembly private
+       ./make_self_nested_test.sh self_nested_access_check_21_${I} 
unverifiable "$OP" assembly family
+       ./make_self_nested_test.sh self_nested_access_check_22_${I} valid "$OP" 
assembly assembly
+       ./make_self_nested_test.sh self_nested_access_check_23_${I} 
unverifiable "$OP" assembly famandassem
+       ./make_self_nested_test.sh self_nested_access_check_24_${I} valid "$OP" 
assembly famorassem
+
+       ./make_self_nested_test.sh self_nested_access_check_25_${I} valid "$OP" 
famandassem public
+       ./make_self_nested_test.sh self_nested_access_check_26_${I} 
unverifiable "$OP" famandassem private
+       ./make_self_nested_test.sh self_nested_access_check_27_${I} 
unverifiable "$OP" famandassem family
+       ./make_self_nested_test.sh self_nested_access_check_28_${I} valid "$OP" 
famandassem assembly
+       ./make_self_nested_test.sh self_nested_access_check_29_${I} valid 
"$unverifiable" famandassem famandassem
+       ./make_self_nested_test.sh self_nested_access_check_30_${I} valid "$OP" 
famandassem famorassem
+
+       ./make_self_nested_test.sh self_nested_access_check_31_${I} valid "$OP" 
famorassem public
+       ./make_self_nested_test.sh self_nested_access_check_32_${I} 
unverifiable "$OP" famorassem private
+       ./make_self_nested_test.sh self_nested_access_check_33_${I} 
unverifiable "$OP" famorassem family
+       ./make_self_nested_test.sh self_nested_access_check_34_${I} valid "$OP" 
famorassem assembly
+       ./make_self_nested_test.sh self_nested_access_check_35_${I} 
unverifiable "$OP" famorassem famandassem
+       ./make_self_nested_test.sh self_nested_access_check_36_${I} valid "$OP" 
famorassem famorassem
+       I=`expr $I + 1`
+done
+
 I=1
 for OP in "ldc.i4.0\n\t\tstfld int32 Class::fld\n\t\tldc.i4.0" 
"ldc.i4.0\n\t\tstsfld int32 Class::sfld" "ldsfld int32 Class::sfld\n\n\tpop" 
"ldfld int32 Class::fld" "ldsflda int32 Class::sfld\n\n\tpop" "ldflda int32 
Class::fld" "call instance int32 Class::Method()" "callvirt int32 
Class::Method()"
 do

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to