Correcty handle should_panic on unsupported targets

Author: GuillaumeGomez

library/test/src/lib.rs

@@ -570,6 +570,10 @@ pub fn convert_benchmarks_to_tests(tests: Vec<TestDescAndFn>) -> Vec<TestDescAnd
         .collect()
 }
 
+pub fn cannot_handle_should_panic() -> bool {
+    (cfg!(target_family = "wasm") || cfg!(target_os = "zkvm")) && !cfg!(target_os = "emscripten")
+}
+
 pub fn run_test(
     opts: &TestOpts,
     force_ignore: bool,
@@ -581,9 +585,8 @@ pub fn run_test(
     let TestDescAndFn { desc, testfn } = test;
 
     // Emscripten can catch panics but other wasm targets cannot
-    let ignore_because_no_process_support = desc.should_panic != ShouldPanic::No
-        && (cfg!(target_family = "wasm") || cfg!(target_os = "zkvm"))
-        && !cfg!(target_os = "emscripten");
+    let ignore_because_no_process_support =
+        desc.should_panic != ShouldPanic::No && cannot_handle_should_panic();
 
     if force_ignore || desc.ignore || ignore_because_no_process_support {
         let message = CompletedTest::new(id, desc, TrIgnored, None, Vec::new());

src/librustdoc/doctest.rs

@@ -1120,6 +1120,10 @@ fn doctest_run_fn(
     rustdoc_options: Arc<RustdocOptions>,
     unused_externs: Arc<Mutex<Vec<UnusedExterns>>>,
 ) -> Result<(), String> {
+    #[cfg(not(bootstrap))]
+    if scraped_test.langstr.should_panic && test::cannot_handle_should_panic() {
+        return Ok(());
+    }
     let report_unused_externs = |uext| {
         unused_externs.lock().unwrap().push(uext);
     };

src/librustdoc/doctest/runner.rs

@@ -267,9 +267,13 @@ test::StaticTestFn(
         runner = if not_running {
             "test::assert_test_result(Ok::<(), String>(()))".to_string()
         } else {
+            // One case to consider: if this is a `should_panic` doctest, on some targets, libtest
+            // ignores such tests because it's not supported. The first `if` checks exactly that.
             format!(
                 "
-if let Some(bin_path) = crate::__doctest_mod::doctest_path() {{
+if {should_panic} && test::cannot_handle_should_panic() {{
+    test::assert_test_result(Ok::<(), String>(()))
+}} else if let Some(bin_path) = crate::__doctest_mod::doctest_path() {{
     test::assert_test_result(crate::__doctest_mod::doctest_runner(bin_path, {id}, {should_panic}))
 }} else {{
     test::assert_test_result(doctest_bundle::{test_id}::__main_fn())