Get tests passing on pulley platforms

* Add a check to `supports_host` for the generated test and assert
  failure also when that is false.
* Remove `pulley_unsupported` test as it falls out of `#[wasmtime_test]`
* Remove `exceptions_store` helper as it falls out of `#[wasmtime_test]`
* Remove miri annotations as they fall out of `#[wasmtime_test]`

Author: alexcrichton

crates/test-macros/src/wasmtime_test.rs

@@ -270,20 +270,21 @@ fn expand(test_config: &TestConfig, func: Fn) -> Result<TokenStream> {
                     &mut config,
                     &#test_config,
                 );
+                let compiler = wasmtime_test_util::wast::Compiler::#strategy_ident;
                 wasmtime_test_util::wasmtime_wast::apply_wast_config(
                     &mut config,
                     &wasmtime_test_util::wast::WastConfig {
-                        compiler: wasmtime_test_util::wast::Compiler::#strategy_ident,
+                        compiler,
                         pooling: false,
                         collector: wasmtime_test_util::wast::Collector::Auto,
                     },
                 );
                 let result = #func_name(&mut config) #await_;
-        if wasmtime_test_util::wast::Compiler::#strategy_ident.should_fail(&#test_config) {
-            assert!(result.is_err());
-        } else {
-            result.unwrap();
-        }
+                if !compiler.supports_host() || compiler.should_fail(&#test_config) {
+                    assert!(result.is_err());
+                } else {
+                    result.unwrap();
+                }
             }
         };
 

tests/all/exceptions.rs

@@ -1,12 +1,10 @@
-use super::exceptions_store;
 use wasmtime::*;
 use wasmtime_test_macros::wasmtime_test;
 
-#[cfg_attr(miri, ignore)]
 #[wasmtime_test(wasm_features(exceptions))]
 fn basic_throw(config: &mut Config) -> Result<()> {
-    let mut store = exceptions_store(config)?;
-    let engine = store.engine();
+    let engine = Engine::new(config)?;
+    let mut store = Store::new(&engine, ());
 
     let module = Module::new(
         &engine,
@@ -39,10 +37,9 @@ fn basic_throw(config: &mut Config) -> Result<()> {
 }
 
 #[wasmtime_test(wasm_features(exceptions))]
-#[cfg_attr(miri, ignore)]
 fn dynamic_tags(config: &mut Config) -> Result<()> {
-    let mut store = exceptions_store(config)?;
-    let engine = store.engine();
+    let engine = Engine::new(config)?;
+    let mut store = Store::new(&engine, ());
 
     let module = Module::new(
         &engine,
@@ -99,10 +96,9 @@ fn dynamic_tags(config: &mut Config) -> Result<()> {
 }
 
 #[wasmtime_test(wasm_features(exceptions))]
-#[cfg_attr(miri, ignore)]
 fn exception_escape_to_host(config: &mut Config) -> Result<()> {
-    let mut store = exceptions_store(config)?;
-    let engine = store.engine();
+    let engine = Engine::new(config)?;
+    let mut store = Store::new(&engine, ());
 
     let module = Module::new(
         &engine,
@@ -132,10 +128,9 @@ fn exception_escape_to_host(config: &mut Config) -> Result<()> {
 }
 
 #[wasmtime_test(wasm_features(exceptions))]
-#[cfg_attr(miri, ignore)]
 fn exception_from_host(config: &mut Config) -> Result<()> {
-    let mut store = exceptions_store(config)?;
-    let engine = store.engine();
+    let engine = Engine::new(config)?;
+    let mut store = Store::new(&engine, ());
 
     let module = Module::new(
         &engine,
@@ -183,10 +178,9 @@ fn exception_from_host(config: &mut Config) -> Result<()> {
 }
 
 #[wasmtime_test(wasm_features(exceptions))]
-#[cfg_attr(miri, ignore)]
 fn exception_across_no_wasm(config: &mut Config) -> Result<()> {
-    let mut store = exceptions_store(config)?;
-    let engine = store.engine();
+    let engine = Engine::new(config)?;
+    let mut store = Store::new(&engine, ());
 
     let functy = FuncType::new(&engine, [ValType::I32], []);
     let tagty = TagType::new(functy.clone());
@@ -214,15 +208,3 @@ fn exception_across_no_wasm(config: &mut Config) -> Result<()> {
 
     Ok(())
 }
-
-#[test]
-#[cfg_attr(miri, ignore)]
-fn pulley_unsupported() -> Result<()> {
-    use wasmtime_environ::TripleExt;
-    let mut config = wasmtime::Config::new();
-    config.target(&target_lexicon::Triple::pulley_host().to_string())?;
-    config.wasm_exceptions(true);
-    assert!(wasmtime::Engine::new(&config).is_err());
-
-    Ok(())
-}

tests/all/main.rs

@@ -123,13 +123,6 @@ pub(crate) fn gc_store() -> Result<wasmtime::Store<()>> {
     Ok(wasmtime::Store::new(&engine, ()))
 }
 
-pub(crate) fn exceptions_store(config: &mut Config) -> Result<wasmtime::Store<()>> {
-    let _ = env_logger::try_init();
-    config.wasm_exceptions(true);
-    let engine = wasmtime::Engine::new(config)?;
-    Ok(wasmtime::Store::new(&engine, ()))
-}
-
 trait ErrorExt {
     fn assert_contains(&self, msg: &str);
 }