Merge branch 'main' into expect-shape

Author: MichaelChirico

NEWS.md

@@ -6,6 +6,7 @@
 * Fixed an issue preventing compilation from succeeding due to deprecation / removal of `std::uncaught_exception()` (@kevinushey, #2047).
 * New `skip_unless_r()` to skip running tests on unsuitable versions of R, e.g. `skip_unless_r(">= 4.1.0")` to skip tests that require, say, `...names` (@MichaelChirico, #2022)
 * New expectation, `expect_shape()`, for testing the shape (i.e., the `length()`, `nrow()` and/or `ncol()`, or `dim()`, all in one place (#1423, @michaelchirico).
+* `skip_on_os()` gains an option `"emscripten"` of the `os` argument to skip tests on Emscripten (@eitsupi, #2103).
 
 # testthat 3.2.3
 

R/skip.R

@@ -170,7 +170,8 @@ skip_on_cran <- function() {
 
 #' @export
 #' @param os Character vector of one or more operating systems to skip on.
-#'   Supported values are `"windows"`, `"mac"`, `"linux"`, and `"solaris"`.
+#'   Supported values are `"windows"`, `"mac"`, `"linux"`, `"solaris"`,
+#'   and `"emscripten"`.
 #' @param arch Character vector of one or more architectures to skip on.
 #'   Common values include `"i386"` (32 bit), `"x86_64"` (64 bit), and
 #'   `"aarch64"` (M1 mac). Supplying `arch` makes the test stricter; i.e. both
@@ -179,15 +180,16 @@ skip_on_cran <- function() {
 skip_on_os <- function(os, arch = NULL) {
   os <- match.arg(
     os,
-    choices = c("windows", "mac", "linux", "solaris"),
+    choices = c("windows", "mac", "linux", "solaris", "emscripten"),
     several.ok = TRUE
   )
 
   msg <- switch(system_os(),
     windows = if ("windows" %in% os) "On Windows",
     darwin =  if ("mac" %in% os) "On Mac",
     linux =   if ("linux" %in% os) "On Linux",
-    sunos =   if ("solaris" %in% os) "On Solaris"
+    sunos =   if ("solaris" %in% os) "On Solaris",
+    emscripten = if ("emscripten" %in% os) "On Emscripten"
   )
 
   if (!is.null(arch) && !is.null(msg)) {

man/skip.Rd

@@ -70,7 +70,7 @@
       skip_on_os("amiga")
     Condition
       Error in `match.arg()`:
-      ! 'arg' should be one of "windows", "mac", "linux", "solaris"
+      ! 'arg' should be one of "windows", "mac", "linux", "solaris", "emscripten"
 
 # can skip on multiple oses
 

tests/testthat/_snaps/skip.md

@@ -122,6 +122,7 @@ test_that("can skip on multiple oses", {
   expect_snapshot_skip(skip_on_os(c("windows", "linux")))
   expect_no_skip(skip_on_os("linux"))
   expect_no_skip(skip_on_os("mac"))
+  expect_no_skip(skip_on_os("emscripten"))
 })
 
 test_that("can refine os with arch", {