Rollup merge of #66789 - eddyb:mir-source-scope-local-data, r=oli-obk

[rust.git] / src / libtest / lib.rs

diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
index 341a2e18db5fcfd50f449851647a41f74512c12f..7647978b3d975dfd0f69667ecf4a95bc6953caf9 100644 (file)
--- a/src/libtest/lib.rs
+++ b/src/libtest/lib.rs
@@ -254,7 +254,7 @@ pub fn run_tests<F>(
     let mut pending = 0;
 
     let (tx, rx) = channel::<CompletedTest>();
-    let run_strategy = if opts.options.panic_abort {
+    let run_strategy = if opts.options.panic_abort && !opts.force_run_in_process {
         RunStrategy::SpawnPrimary
     } else {
         RunStrategy::InProcess