Fix more tests now that they can run on Wasmtime

Author: lukewagner

test/README.md

@@ -4,11 +4,14 @@ This directory contains Component Model reference tests, grouped by functionalit
 
 ## Running in Wasmtime
 
+(Until the `component-model-async` and `component-model-async-builtins` features
+are enabled by default, they must be explicitly enabled as shown below.)
+
 A single `.wast` test can be run via:
 ```
-wasmtime wast -W component-model-async=y the-test.wast
+wasmtime wast -W component-model-async=y -W component-model-async-builtins=y the-test.wast
 ```
 All the tests can be run from this directory via:
 ```
-find . -name "*.wast" | xargs wasmtime wast -W component-model-async=y
+find . -name "*.wast" | xargs wasmtime wast -W component-model-async=y -W component-model-async-builtins=y
 ```

test/async/sync-streams.wast

@@ -36,7 +36,7 @@
         (local.set $bufp (i32.const 16))
         (i32.store (local.get $bufp) (i32.const 0x01234567))
         (local.set $ret (call $stream.write (local.get $tx) (local.get $bufp) (i32.const 4)))
-        (if (i32.ne (i32.const 0x40 (; DROPPED=1 | (4<<4) ;)) (local.get $ret))
+        (if (i32.ne (i32.const 0x41 (; DROPPED=1 | (4<<4) ;)) (local.get $ret))
           (then unreachable))
 
         (call $stream.drop-writable (local.get $tx))
@@ -57,7 +57,7 @@
         ;; synchronously, switch to the caller who will write and rendezvous
         (local.set $bufp (i32.const 16))
         (local.set $ret (call $stream.read (local.get $rx) (local.get $bufp) (i32.const 4)))
-        (if (i32.ne (i32.const 0x40 (; DROPPED=1 | (4<<4) ;)) (local.get $ret))
+        (if (i32.ne (i32.const 0x41 (; DROPPED=1 | (4<<4) ;)) (local.get $ret))
           (then unreachable))
         (if (i32.ne (i32.const 0x89abcdef) (i32.load (local.get $bufp)))
           (then unreachable))

test/values/trap-in-post-return.wast

@@ -22,7 +22,7 @@
     (canon resource.drop $R (core func $resource.drop))
     (canon task.return (core func $task.return))
     (canon task.cancel (core func $task.cancel))
-    (canon yield (core func $yield))
+    (canon thread.yield (core func $yield))
     (canon waitable-set.new (core func $waitable-set.new))
     (canon waitable-set.wait (memory $memory "mem") (core func $waitable-set.wait))
     (canon waitable-set.poll (memory $memory "mem") (core func $waitable-set.poll))