Tweak tests to work also in R (< 4.1.0)

futureverse · Feb 11, 2025 · 05ac2ea · 05ac2ea
1 parent f39879c
commit 05ac2ea
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: future
-Version: 1.34.0-9119
+Version: 1.34.0-9120
 Title: Unified Parallel and Distributed Processing in R for Everyone
 Imports:
     digest,

diff --git a/tests/demo.R b/tests/demo.R
@@ -1,5 +1,9 @@
 source("incl/start.R")
 
+## Avoid 'Error: C stack usage  7971940 is too close to the limit'
+## on R (< 4.1.0)
+if (getRversion() < "4.1") options(future.debug = FALSE)
+
 message("*** Demos ...")
 
 message("*** Fibonacci demo of the 'future' package ...")

diff --git a/tests/future,optsenvvars.R b/tests/future,optsenvvars.R
@@ -55,9 +55,14 @@ for (strategy in strategies) {
 
   ## Any changed?
   for (name in names(old_envvars)) {
+    if (!identical(envvars[[name]], old_envvars[[name]])) {
+      if (getRversion() < "4.1.0") {
+        old_envvars[[name]] <- sub("=$", "", old_envvars[[name]])
+      }
       if (!identical(envvars[[name]], old_envvars[[name]])) {
-          stop(sprintf("Detected modified environment variable: %s=%s (was %s)", name, sQuote(envvars[[name]]), sQuote(old_envvars[[name]])))
+        stop(sprintf("Detected modified environment variable: %s=%s (was %s)", name, sQuote(envvars[[name]]), sQuote(old_envvars[[name]])))
       }
+    }
   }
 
   stopifnot(all.equal(envvars, old_envvars))