From 3a3a452de8bb1bcb5c94245d207aec81e7964978 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 9 Oct 2024 08:34:33 -0700
Subject: [PATCH] Remove usage of wasmtime_test macro

---
 tests/all/module.rs |  1 -
 tests/all/traps.rs  | 33 ++++++++++++++++++++-------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/tests/all/module.rs b/tests/all/module.rs
index 4886a8e3986a..4fe1f12cf94b 100644
--- a/tests/all/module.rs
+++ b/tests/all/module.rs
@@ -492,7 +492,6 @@ fn concurrent_type_modifications_and_checks() -> Result<()> {
 
     let mut config = Config::new();
     config.wasm_function_references(true);
-
     let engine = Engine::new(&config)?;
 
     let mut threads = Vec::new();
diff --git a/tests/all/traps.rs b/tests/all/traps.rs
index eb3ae6ee07dc..e4ed5df21269 100644
--- a/tests/all/traps.rs
+++ b/tests/all/traps.rs
@@ -5,7 +5,6 @@ use std::panic::{self, AssertUnwindSafe};
 use std::process::Command;
 use std::sync::{Arc, Mutex};
 use wasmtime::*;
-use wasmtime_test_macros::wasmtime_test;
 
 #[test]
 fn test_trap_return() -> Result<()> {
@@ -1681,9 +1680,11 @@ fn async_stack_size_ignored_if_disabled() -> Result<()> {
     Ok(())
 }
 
-#[wasmtime_test(wasm_features(tail_call))]
-fn tail_call_to_imported_function(config: &mut Config) -> Result<()> {
-    let engine = Engine::new(config)?;
+#[test]
+fn tail_call_to_imported_function() -> Result<()> {
+    let mut config = Config::new();
+    config.wasm_tail_call(true);
+    let engine = Engine::new(&config)?;
 
     let module = Module::new(
         &engine,
@@ -1709,9 +1710,11 @@ fn tail_call_to_imported_function(config: &mut Config) -> Result<()> {
     Ok(())
 }
 
-#[wasmtime_test(wasm_features(tail_call))]
-fn tail_call_to_imported_function_in_start_function(config: &mut Config) -> Result<()> {
-    let engine = Engine::new(config)?;
+#[test]
+fn tail_call_to_imported_function_in_start_function() -> Result<()> {
+    let mut config = Config::new();
+    config.wasm_tail_call(true);
+    let engine = Engine::new(&config)?;
 
     let module = Module::new(
         &engine,
@@ -1736,9 +1739,11 @@ fn tail_call_to_imported_function_in_start_function(config: &mut Config) -> Resu
     Ok(())
 }
 
-#[wasmtime_test(wasm_features(tail_call, function_references))]
-fn return_call_ref_to_imported_function(config: &mut Config) -> Result<()> {
-    let engine = Engine::new(config)?;
+#[test]
+fn return_call_ref_to_imported_function() -> Result<()> {
+    let mut config = Config::new();
+    config.wasm_tail_call(true);
+    let engine = Engine::new(&config)?;
 
     let module = Module::new(
         &engine,
@@ -1763,9 +1768,11 @@ fn return_call_ref_to_imported_function(config: &mut Config) -> Result<()> {
     Ok(())
 }
 
-#[wasmtime_test(wasm_features(tail_call, function_references))]
-fn return_call_indirect_to_imported_function(config: &mut Config) -> Result<()> {
-    let engine = Engine::new(config)?;
+#[test]
+fn return_call_indirect_to_imported_function() -> Result<()> {
+    let mut config = Config::new();
+    config.wasm_tail_call(true);
+    let engine = Engine::new(&config)?;
 
     let module = Module::new(
         &engine,