hum

Author: lionel-

crates/ark/src/interface.rs

@@ -369,17 +369,6 @@ impl RMain {
             panic!("not testing");
         }
 
-        // In tests R may be run from various threads. This confuses R's stack
-        // overflow checks so we disable those. This should not make it in
-        // production builds as it causes stack overflows to crash R instead of
-        // throwing an R error.
-        if harp::test::IS_TESTING {
-            panic!("testing");
-            unsafe {
-                libr::set(libr::R_CStackLimit, usize::MAX);
-            }
-        }
-
         crate::sys::interface::setup_r(args);
 
         libraries.initialize_post_setup_r();

crates/ark/src/sys/unix/interface.rs

@@ -68,6 +68,16 @@ pub fn setup_r(mut args: Vec<*mut c_char>) {
         libr::set(ptr_R_Busy, Some(r_busy));
         libr::set(ptr_R_Suicide, Some(r_suicide));
 
+        // In tests R may be run from various threads. This confuses R's stack
+        // overflow checks so we disable those. This should not make it in
+        // production builds as it causes stack overflows to crash R instead of
+        // throwing an R error.
+        if harp::test::IS_TESTING {
+            unsafe {
+                libr::set(libr::R_CStackLimit, usize::MAX);
+            }
+        }
+
         // Set up main loop
         setup_Rmainloop();
     }