From a69e9cc1b731705341e50c68c33882bc05eab399 Mon Sep 17 00:00:00 2001
From: daxpedda <daxpedda@gmail.com>
Date: Mon, 14 Oct 2024 00:00:24 +0200
Subject: [PATCH] Fix `#[should_panic]` with `unsupported` tests (#4196)

---
 CHANGELOG.md                 |  3 +++
 crates/test-macro/src/lib.rs | 18 +++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 511f27575be..d066a6eddde 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,9 @@
 * Fixed triggering lints in testing facilities.
   [#4195](https://github.com/rustwasm/wasm-bindgen/pull/4195)
 
+* Fixed `#[should_panic]` not working with `#[wasm_bindgen_test(unsupported = ...)]`.
+  [#4196](https://github.com/rustwasm/wasm-bindgen/pull/4196)
+
 --------------------------------------------------------------------------------
 
 ## [0.2.95](https://github.com/rustwasm/wasm-bindgen/compare/0.2.94...0.2.95)
diff --git a/crates/test-macro/src/lib.rs b/crates/test-macro/src/lib.rs
index 094427f2deb..d0cd7a5fc2c 100644
--- a/crates/test-macro/src/lib.rs
+++ b/crates/test-macro/src/lib.rs
@@ -82,7 +82,7 @@ pub fn wasm_bindgen_test(
 
     let mut tokens = Vec::<TokenTree>::new();
 
-    let should_panic = match should_panic {
+    let should_panic_par = match &should_panic {
         Some(Some(lit)) => {
             quote! { ::core::option::Option::Some(::core::option::Option::Some(#lit)) }
         }
@@ -99,9 +99,9 @@ pub fn wasm_bindgen_test(
     };
 
     let test_body = if attributes.r#async {
-        quote! { cx.execute_async(test_name, #ident, #should_panic, #ignore); }
+        quote! { cx.execute_async(test_name, #ident, #should_panic_par, #ignore); }
     } else {
-        quote! { cx.execute_sync(test_name, #ident, #should_panic, #ignore); }
+        quote! { cx.execute_sync(test_name, #ident, #should_panic_par, #ignore); }
     };
 
     // We generate a `#[no_mangle]` with a known prefix so the test harness can
@@ -127,6 +127,18 @@ pub fn wasm_bindgen_test(
         tokens.extend(
             quote! { #[cfg_attr(not(all(target_arch = "wasm32", target_os = "unknown")), #path)] },
         );
+
+        if let Some(should_panic) = should_panic {
+            let should_panic = if let Some(lit) = should_panic {
+                quote! { should_panic = #lit }
+            } else {
+                quote! { should_panic }
+            };
+
+            tokens.extend(
+                quote! { #[cfg_attr(not(all(target_arch = "wasm32", target_os = "unknown")), #should_panic)] }
+            )
+        }
     }
 
     tokens.extend(leading_tokens);