Specify extra runtime flags in tests, not CI

.github/workflows/main.yml

@@ -160,8 +160,7 @@ jobs:
     - run: |
         cargo run test --languages rust,c,go tests/runtime-async \
           --artifacts target/artifacts \
-          --rust-wit-bindgen-path ./crates/guest-rust \
-          --runner "wasmtime -W component-model-async -W component-model-threading -W component-model-async-stackful"
+          --rust-wit-bindgen-path ./crates/guest-rust
 
   test_unit:
     name: Crate Unit Tests

crates/test/src/config.rs

@@ -64,6 +64,11 @@ pub struct RuntimeTestConfig<T = HashMap<String, toml::Value>> {
     #[serde(default)]
     pub args: StringList,
 
+    /// Extra command line arguments to to pass to Wasmtime, such as enabling
+    /// extra wasm features.
+    #[serde(default)]
+    pub wasmtime_flags: StringList,
+
     /// Language-specific configuration
     //
     // Note that this is an `Option<T>` where `T` defaults to a catch-all hash

crates/test/src/go.rs

@@ -115,10 +115,9 @@ impl LanguageMethods for Go {
 
 fn package_name(package: &str) -> &str {
     package
-        .split_once('\n')
-        .unwrap()
-        .0
-        .strip_prefix("package ")
+        .lines()
+        .filter_map(|l| l.strip_prefix("package "))
+        .next()
         .unwrap()
         .trim()
 }

crates/test/src/lib.rs

@@ -193,6 +193,9 @@ struct Component {
 
     /// The contents of the test file itself.
     lang_config: Option<HashMap<String, toml::Value>>,
+
+    /// Runtime flags to wasmtime.
+    wasmtime_flags: config::StringList,
 }
 
 #[derive(Clone)]
@@ -467,6 +470,7 @@ impl Runner {
             kind,
             contents,
             lang_config: config.lang,
+            wasmtime_flags: config.wasmtime_flags,
         })
     }
 
@@ -911,7 +915,17 @@ impl Runner {
         let composed_wasm = dst.join(filename);
         write_if_different(&composed_wasm, &composed)?;
 
-        self.run_command(self.test_runner.command().arg(&composed_wasm))?;
+        let mut cmd = self.test_runner.command();
+        for component in [runner]
+            .into_iter()
+            .chain(test_components.iter().map(|(c, _)| c))
+        {
+            for flag in Vec::from(component.wasmtime_flags.clone()) {
+                cmd.arg(flag);
+            }
+        }
+        cmd.arg(&composed_wasm);
+        self.run_command(&mut cmd)?;
         Ok(())
     }
 

tests/runtime-async/async/cancel-import/runner.c

@@ -1,4 +1,5 @@
 //@ args = '--rename my:test/i=test --async=-run'
+//@ wasmtime-flags = '-Wcomponent-model-async'
 
 #include <assert.h>
 #include <runner.h>

tests/runtime-async/async/cancel-import/runner.rs

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 include!(env!("BINDINGS"));
 
 use crate::my::test::i::*;

tests/runtime-async/async/future-cancel-read/runner.c

@@ -1,4 +1,5 @@
 //@ args = '--rename my:test/i=test --async=-run'
+//@ wasmtime-flags = '-Wcomponent-model-async'
 
 #include <assert.h>
 #include <runner.h>

tests/runtime-async/async/future-cancel-read/runner.rs

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 include!(env!("BINDINGS"));
 
 use crate::my::test::i::*;

tests/runtime-async/async/future-cancel-write-then-read/runner.rs

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 include!(env!("BINDINGS"));
 
 use crate::a::b::the_test::f;

tests/runtime-async/async/future-cancel-write/runner.c

@@ -1,4 +1,5 @@
 //@ args = '--rename my:test/i=test --async=-run'
+//@ wasmtime-flags = '-Wcomponent-model-async'
 
 #include <assert.h>
 #include <runner.h>

tests/runtime-async/async/future-cancel-write/runner.rs

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 include!(env!("BINDINGS"));
 
 use crate::my::test::i::{read_and_drop, take_then_drop};

tests/runtime-async/async/future-close-after-coming-back/runner.rs

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 include!(env!("BINDINGS"));
 
 use crate::a::b::the_test::f;

tests/runtime-async/async/future-close-then-receive-read/runner.rs

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 include!(env!("BINDINGS"));
 
 use crate::a::b::the_test::{get, set};

tests/runtime-async/async/future-closes-with-error/runner.rs

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 include!(env!("BINDINGS"));
 
 use crate::a::b::the_test::f;

tests/runtime-async/async/future-write-then-read-comes-back/runner.rs

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 include!(env!("BINDINGS"));
 
 use crate::a::b::the_test::f;

tests/runtime-async/async/future-write-then-read-remote/runner.rs

@@ -1,4 +1,5 @@
 //@ args = '--async=-all'
+//@ wasmtime-flags = '-Wcomponent-model-async'
 
 include!(env!("BINDINGS"));
 

tests/runtime-async/async/future-write-then-read-remote/runner2.rs

@@ -1,4 +1,5 @@
 //@ args = '--async=-all'
+//@ wasmtime-flags = '-Wcomponent-model-async'
 
 include!(env!("BINDINGS"));
 

tests/runtime-async/async/incomplete-writes/runner.go

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 package export_wit_world
 
 import (

tests/runtime-async/async/pending-import/runner.c

@@ -1,4 +1,5 @@
 //@ args = '--rename my:test/i=test --async=-run'
+//@ wasmtime-flags = '-Wcomponent-model-async'
 
 #include <assert.h>
 #include <runner.h>

tests/runtime-async/async/pending-import/runner.rs

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 include!(env!("BINDINGS"));
 
 use crate::my::test::i::*;

tests/runtime-async/async/ping-pong/runner.c

@@ -1,4 +1,5 @@
 //@ args = '--rename my:test/i=test --async=-run'
+//@ wasmtime-flags = '-Wcomponent-model-async'
 
 #include <assert.h>
 #include <string.h>

tests/runtime-async/async/ping-pong/runner.go

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 package export_wit_world
 
 import (

tests/runtime-async/async/ping-pong/runner.rs

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 include!(env!("BINDINGS"));
 
 use crate::my::test::i::{ping, pong};

tests/runtime-async/async/rust-cross-task-wakeup/runner.rs

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 include!(env!("BINDINGS"));
 
 use crate::my::test::i::*;

tests/runtime-async/async/rust-lowered-send/runner.rs

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 include!(env!("BINDINGS"));
 
 use crate::a::b::i::*;

tests/runtime-async/async/simple-call-import/runner.c

@@ -1,4 +1,6 @@
 //@ args = '--rename a:b/i=test --async=-run'
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 #include <assert.h>
 #include <runner.h>
 

tests/runtime-async/async/simple-call-import/runner.go

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 package export_wit_world
 
 import test "wit_component/a_b_i"

tests/runtime-async/async/simple-call-import/runner.rs

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 include!(env!("BINDINGS"));
 
 struct Component;

tests/runtime-async/async/simple-future/runner.c

@@ -1,4 +1,5 @@
 //@ args = '--rename my:test/i=test --async=-run'
+//@ wasmtime-flags = '-Wcomponent-model-async'
 
 #include <runner.h>
 #include <assert.h>

tests/runtime-async/async/simple-future/runner.cs

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 using System;
 using System.Runtime.InteropServices;
 using System.Diagnostics;
@@ -29,7 +31,7 @@ public static Task Run()
 
             writer.Dispose();
             set.Dispose();
-        }   
+        }
 
         {
             var (reader, writer) = IIImports.FutureNew();
@@ -61,4 +63,4 @@ public static int RunCallback()
     {
         throw new NotImplementedException();
     }
-}
+}

tests/runtime-async/async/simple-future/runner.go

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 package export_wit_world
 
 import (
@@ -54,9 +56,9 @@ func Run() {
 		close(syncBarrier)
 
 		go func() {
-			// If this is omitted, the host will see that the "rx.Read" operations aren't paired with 
-			// a "tx.Write" and will result in a "wasm trap: deadlock detected" error. Additionally, 
-			// this is placed after "close(syncBarrier)" to ensure that the panics are resulting from 
+			// If this is omitted, the host will see that the "rx.Read" operations aren't paired with
+			// a "tx.Write" and will result in a "wasm trap: deadlock detected" error. Additionally,
+			// this is placed after "close(syncBarrier)" to ensure that the panics are resulting from
 			// concurrent reads, and not from other scenarios that result in a nil handle.
 			tx.Write(wit_types.Unit{})
 		}()
@@ -85,9 +87,9 @@ func Run() {
 		close(syncBarrier)
 
 		go func() {
-			// If this is omitted, the host will see that the "tx.Write" operations aren't paired with 
-			// an "rx.Read" and will result in a "wasm trap: deadlock detected" error. Additionally, 
-			// this is placed after "close(syncBarrier)" to ensure that the panics are resulting from 
+			// If this is omitted, the host will see that the "tx.Write" operations aren't paired with
+			// an "rx.Read" and will result in a "wasm trap: deadlock detected" error. Additionally,
+			// this is placed after "close(syncBarrier)" to ensure that the panics are resulting from
 			// concurrent writes, and not from other scenarios that result in a nil handle.
 			rx.Read()
 		}()

tests/runtime-async/async/simple-future/runner.rs

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 include!(env!("BINDINGS"));
 
 use crate::my::test::i::*;

tests/runtime-async/async/simple-import-params-results/runner.c

@@ -1,4 +1,5 @@
 //@ args = '--rename a:b/i=test --async=-run'
+//@ wasmtime-flags = '-Wcomponent-model-async'
 
 #include <assert.h>
 #include <runner.h>

tests/runtime-async/async/simple-import-params-results/runner.cs

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 using System;
 using System.Runtime.InteropServices;
 using System.Diagnostics;

tests/runtime-async/async/simple-import-params-results/runner.go

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 package export_wit_world
 
 import (

tests/runtime-async/async/simple-import-params-results/runner.rs

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 include!(env!("BINDINGS"));
 
 use crate::a::b::i::*;

tests/runtime-async/async/simple-pending-import/runner.c

@@ -1,4 +1,6 @@
 //@ args = '--rename a:b/i=test --async=-run'
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 #include <assert.h>
 #include <runner.h>
 

tests/runtime-async/async/simple-pending-import/runner.go

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 package export_wit_world
 
 import test "wit_component/a_b_i"

tests/runtime-async/async/simple-pending-import/runner.rs

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 include!(env!("BINDINGS"));
 
 struct Component;

tests/runtime-async/async/simple-stream-payload/runner.c

@@ -1,4 +1,5 @@
 //@ args = '--rename my:test/i=test --async=-run'
+//@ wasmtime-flags = '-Wcomponent-model-async'
 
 #include <runner.h>
 #include <assert.h>

tests/runtime-async/async/simple-stream-payload/runner.go

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 package export_wit_world
 
 import (

tests/runtime-async/async/simple-stream-payload/runner.rs

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 include!(env!("BINDINGS"));
 
 use crate::my::test::i::*;

tests/runtime-async/async/simple-stream/runner.c

@@ -1,4 +1,5 @@
 //@ args = '--rename my:test/i=test --async=-run'
+//@ wasmtime-flags = '-Wcomponent-model-async'
 
 #include <runner.h>
 #include <assert.h>

tests/runtime-async/async/simple-stream/runner.go

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 package export_wit_world
 
 import (
@@ -53,9 +55,9 @@ func Run() {
 		close(syncBarrier)
 
 		go func() {
-			// If this is omitted, the host will see that the "rx.Read" operations aren't paired with 
-			// a "tx.WriteAll" and will result in a "wasm trap: deadlock detected" error. Additionally, 
-			// this is placed after "close(syncBarrier)" to ensure that the panics are resulting from 
+			// If this is omitted, the host will see that the "rx.Read" operations aren't paired with
+			// a "tx.WriteAll" and will result in a "wasm trap: deadlock detected" error. Additionally,
+			// this is placed after "close(syncBarrier)" to ensure that the panics are resulting from
 			// concurrent reads, and not from other scenarios that result in a nil handle.
 			tx.WriteAll([]wit_types.Unit{wit_types.Unit{}})
 		}()
@@ -84,9 +86,9 @@ func Run() {
 		close(syncBarrier)
 
 		go func() {
-			// If this is omitted, the host will see that the "tx.WriteAll" operations aren't paired with 
-			// an "rx.Read" and will result in a "wasm trap: deadlock detected" error. Additionally, 
-			// this is placed after "close(syncBarrier)" to ensure that the panics are resulting from 
+			// If this is omitted, the host will see that the "tx.WriteAll" operations aren't paired with
+			// an "rx.Read" and will result in a "wasm trap: deadlock detected" error. Additionally,
+			// this is placed after "close(syncBarrier)" to ensure that the panics are resulting from
 			// concurrent writes, and not from other scenarios that result in a nil handle.
 			result := make([]wit_types.Unit, 1)
 			rx.Read(result)

tests/runtime-async/async/simple-stream/runner.rs

@@ -1,3 +1,5 @@
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 include!(env!("BINDINGS"));
 
 use crate::my::test::i::*;

tests/runtime-async/async/simple-yield/runner.c

@@ -1,4 +1,6 @@
 //@ args = '--rename a:b/i=test --async=-run'
+//@ wasmtime-flags = '-Wcomponent-model-async'
+
 #include <assert.h>
 #include <runner.h>