[test] Account for one-pass implementations in more places

Author: YerinAlexey

test/core/binary.wast

@@ -1351,6 +1351,7 @@
 (assert_malformed
   (module binary
       "\00asm" "\01\00\00\00"
+      "\01\04\01\60\00\00"        ;; Type section
       "\03\02\01\00"              ;; Function section
       "\08\01\00"                 ;; Start section: function 0
       "\07\01\00"                 ;; Export section with zero entries
@@ -1362,6 +1363,7 @@
 (assert_malformed
   (module binary
       "\00asm" "\01\00\00\00"
+      "\01\04\01\60\00\00"        ;; Type section
       "\03\02\01\00"              ;; Function section
       "\09\01\00"                 ;; Element section with zero entries
       "\08\01\00"                 ;; Start section: function 0

test/core/data.wast

@@ -412,6 +412,12 @@
   "type mismatch"
 )
 
+(module
+  (global (export "global-i32") i32 (i32.const 0))
+  (global (export "global-mut-i32") (mut i32) (i32.const 0))
+)
+(register "test")
+
 (assert_invalid
   (module
     (global (import "test" "global-i32") i32)
@@ -464,7 +470,7 @@
 
 (assert_invalid
   (module
-    (global $g (import "test" "g") (mut i32))
+    (global $g (import "test" "global-mut-i32") (mut i32))
     (memory 1)
     (data (global.get $g))
   )

test/core/elem.wast

@@ -403,6 +403,12 @@
   "type mismatch"
 )
 
+(module
+  (global (export "global-i32") i32 (i32.const 0))
+  (global (export "global-mut-i32") (mut i32) (i32.const 0))
+)
+(register "test")
+
 (assert_invalid
   (module
     (global (import "test" "global-i32") i32)
@@ -456,7 +462,7 @@
 
 (assert_invalid
   (module
-    (global $g (import "test" "g") (mut i32))
+    (global $g (import "test" "global-mut-i32") (mut i32))
     (table 1 funcref)
     (elem (global.get $g))
   )

test/core/global.wast

@@ -328,8 +328,15 @@
   "type mismatch"
 )
 
+(module
+  (global (export "extern") externref (ref.null extern))
+  (global (export "global-i32") i32 (i32.const 0))
+  (global (export "global-mut-i32") (mut i32) (i32.const 0))
+)
+(register "test")
+
 (assert_invalid
-  (module (global (import "" "") externref) (global funcref (global.get 0)))
+  (module (global (import "test" "extern") externref) (global funcref (global.get 0)))
   "type mismatch"
 )
 

test/core/imports.wast

@@ -485,11 +485,14 @@
 (assert_trap (invoke "load" (i32.const 1000000)) "out of bounds memory access")
 
 (assert_invalid
-  (module (import "" "" (memory 1)) (import "" "" (memory 1)))
+  (module
+    (import "test" "memory-2-inf" (memory 2))
+    (import "spectest" "memory" (memory 1))
+  )
   "multiple memories"
 )
 (assert_invalid
-  (module (import "" "" (memory 1)) (memory 0))
+  (module (import "spectest" "memory" (memory 1)) (memory 0))
   "multiple memories"
 )
 (assert_invalid

test/core/ref_func.wast

@@ -1,5 +1,6 @@
 (module
   (func (export "f") (param $x i32) (result i32) (local.get $x))
+  (func (export "g") (param $x i32) (result i32) (i32.add (local.get $x) (i32.const 2)))
 )
 (register "M")