2009-07-20 Rodrigo Kumpera <rkumpera@novell.com>

	* Makefile: Add support for new test kind badmd for tests with broken
	metadata.

	* make_tests.sh: Fix some tests that have broken metadata.

	* *.sh: Add execute bit.

svn path=/trunk/mono/; revision=138236

diff --git a/mono/tests/verifier/ChangeLog b/mono/tests/verifier/ChangeLog
index 135c036d4097681a684d28a2a4f0644dd28c9f3a..0121e37283a1d8031c53d5ccb94492dce2bf145f 100644 (file)
--- a/mono/tests/verifier/ChangeLog
+++ b/mono/tests/verifier/ChangeLog
@@ -1,3 +1,12 @@
+2009-07-20 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * Makefile: Add support for new test kind badmd for tests with broken
+       metadata.
+
+       * make_tests.sh: Fix some tests that have broken metadata.
+
+       * *.sh: Add execute bit.
+
 2009-04-28 Rodrigo Kumpera  <rkumpera@novell.com>
 
        * valid_ldflda_owned_field_on_cctor.il: Fix visibility of .ctor.

diff --git a/mono/tests/verifier/Makefile b/mono/tests/verifier/Makefile
index dc49a0a7e1b4854a70d83e4b0cf9f56d6517a4d4..dd0dfaa1c159f687238b2557cc811d9d2b8618a2 100644 (file)
--- a/mono/tests/verifier/Makefile
+++ b/mono/tests/verifier/Makefile
@@ -46,6 +46,10 @@ run-test: compile-stamp
                then \
                        RES=2; \
                fi; \
+               if [ "$$FIRST" == "badmd" ]; \
+               then \
+                       RES=1; \
+               fi; \
                if [ "$$FIRST" == "valid" ]; \
                then \
                        RES=0; \

diff --git a/mono/tests/verifier/make_access_test.sh b/mono/tests/verifier/make_access_test.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/mono/tests/verifier/make_bool_branch_test.sh b/mono/tests/verifier/make_bool_branch_test.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/mono/tests/verifier/make_field_store_test.sh b/mono/tests/verifier/make_field_store_test.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/mono/tests/verifier/make_field_valuetype_test.sh b/mono/tests/verifier/make_field_valuetype_test.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/mono/tests/verifier/make_load_test.sh b/mono/tests/verifier/make_load_test.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/mono/tests/verifier/make_nested_access_test.sh b/mono/tests/verifier/make_nested_access_test.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/mono/tests/verifier/make_ret_test.sh b/mono/tests/verifier/make_ret_test.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/mono/tests/verifier/make_tests.sh b/mono/tests/verifier/make_tests.sh
index 355485ef6b2b7c55f72a7883d5dedbe56d9a9495..3b0365cb2ac50a80d5b98e59d8c1475eecd2ae49 100755 (executable)
--- a/mono/tests/verifier/make_tests.sh
+++ b/mono/tests/verifier/make_tests.sh
@@ -321,15 +321,19 @@ do
     I=`expr $I + 1`
   done
 
-  for TYPE in 'object' 'string' 'class Class' 'valuetype MyStruct' 'int32[]' 'int32[,]' 'typedref' 'int32*' 'method int32 *(int32)' 'class Template`1<object>' 'int8&' 'bool&' 'unsigned int8&' 'int16&' 'char&' 'unsigned int16&' 'int32&' 'unsigned int32&' 'int64&' 'unsigned int64&' 'float32&' 'float64&' 'native int&' 'native unsigned int&' 'object&' 'string&' 'class Class&' 'valuetype MyStruct&' 'int32[]&' 'int32[,]&' 'typedref&'  'class Template`1<object>&'
+  for TYPE in 'object' 'string' 'class Class' 'valuetype MyStruct' 'int32[]' 'int32[,]' 'typedref' 'int32*' 'method int32 *(int32)' 'class Template`1<object>' 'int8&' 'bool&' 'unsigned int8&' 'int16&' 'char&' 'unsigned int16&' 'int32&' 'unsigned int32&' 'int64&' 'unsigned int64&' 'float32&' 'float64&' 'native int&' 'native unsigned int&' 'object&' 'string&' 'class Class&' 'valuetype MyStruct&' 'int32[]&' 'int32[,]&' 'class Template`1<object>&'
   do
     ./make_unary_test.sh conv_op_${J}_${I} unverifiable $OP "$TYPE"
     I=`expr $I + 1`
   done
+
+  ./make_unary_test.sh conv_op_${J}_${I} badmd $OP "$TYPE" "typedref&"
   J=`expr $J + 1`
   I=1
 done
 
+
+
 #local and argument store with invalid values lead to unverifiable code
 I=1
 for OP in stloc.0 "stloc.s 0" "starg 0" "starg.s 0"
@@ -431,7 +435,7 @@ do
   ./make_store_test.sh coercion_78_${I} unverifiable "$OP" typedref 'native int'
   ./make_store_test.sh coercion_89_${I} unverifiable "$OP" typedref int64
   ./make_store_test.sh coercion_80_${I} unverifiable "$OP" typedref float64
-  ./make_store_test.sh coercion_81_${I} unverifiable "$OP" typedref 'typedref&'
+  ./make_store_test.sh coercion_81_${I} badmd "$OP" typedref 'typedref&'
   ./make_store_test.sh coercion_82_${I} unverifiable "$OP" typedref object
   I=`expr $I + 1`
 done
@@ -1048,7 +1052,7 @@ done
 ./make_ret_test.sh ret_coercion_78 unverifiable typedref 'native int'
 ./make_ret_test.sh ret_coercion_79 unverifiable typedref int64
 ./make_ret_test.sh ret_coercion_80 unverifiable typedref float64
-./make_ret_test.sh ret_coercion_81 unverifiable typedref 'typedref&'
+./make_ret_test.sh ret_coercion_81 badmd typedref 'typedref&'
 ./make_ret_test.sh ret_coercion_82 unverifiable typedref object
 
 ./make_ret_test.sh ret_coercion_83 valid int32 "native int"
@@ -3669,7 +3673,7 @@ done
 
 for TYPE in "int32\&" "void"
 do
-       ./make_stobj_test.sh stobj_simple_${I} invalid "$TYPE" "$TYPE\&" "$TYPE" 
+       ./make_stobj_test.sh stobj_simple_${I} badmd "$TYPE" "$TYPE\&" "$TYPE" 
        I=`expr $I + 1`
 done
 
@@ -3794,7 +3798,7 @@ done
 #should be able to use invalid types
 for TYPE in "int32\&" "void"
 do
-       ./make_cpobj_test.sh cpobj_simple_${I} invalid "${TYPE}\&" "${TYPE}\&" "${TYPE}"
+       ./make_cpobj_test.sh cpobj_simple_${I} badmd "${TYPE}\&" "${TYPE}\&" "${TYPE}"
        I=`expr $I + 1`
 done
 
@@ -3825,12 +3829,14 @@ done
 
 #bad token type
 I=1
-for TYPE in "int32\&" "void"
+for TYPE in "int32\&"
 do
        ./make_cpobj_test.sh cpobj_bad_token_type_${I} invalid "int32\&" "int32\&" "${TYPE}"
        I=`expr $I + 1`
 done
 
+./make_cpobj_test.sh cpobj_bad_token_type_2 badmd "int32\&" "int32\&" "void"
+
 #src compat to token
 ./make_cpobj_test.sh cpobj_src_compat_1 valid "int32\&" "int32\&" "native int"
 ./make_cpobj_test.sh cpobj_src_compat_2 valid "native int\&" "int32\&" "int32"