Skip to content

Re-enable catch tests on windows #2104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 25, 2025
Merged

Re-enable catch tests on windows #2104

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfa8bbe
Re-enable catch tests on windows
hadley Jul 24, 2025
60b14b7
Fix thinkos
hadley Jul 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 21 additions & 31 deletions tests/test-catch.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 +1,43 @@
library(testthat)

local({

# Disable test on Windows, pending devtools
# compatibility with new toolchain
isWindows <- Sys.info()[["sysname"]] == "Windows"
if (isWindows)
return()

# Disable tests on Solaris, because we don't use Catch there.
isSolaris <- Sys.info()[["sysname"]] == "SunOS"
if (isSolaris)
return()

if (!requireNamespace("usethis", quietly = TRUE))
if (!requireNamespace("usethis", quietly = TRUE)) {
return()

# devel <- try(pkgbuild::has_compiler(), silent = TRUE)
# if (!isTRUE(devel))
# return()
}

quietly <- function(expr) {
suppressMessages(capture_output(result <- expr))
result
}

perform_test <- function(pkgName, catchEnabled) {

owd <- setwd(tempdir())
on.exit(setwd(owd), add = TRUE)

pkgPath <- file.path(tempdir(), pkgName)
libPath <- file.path(tempdir(), "rlib")
if (!utils::file_test("-d", libPath))
if (!utils::file_test("-d", libPath)) {
dir.create(libPath)
}
.libPaths(c(libPath, .libPaths()))

on.exit({
unlink(pkgPath, recursive = TRUE)
unlink(libPath, recursive = TRUE)
}, add = TRUE)
on.exit(
{
unlink(pkgPath, recursive = TRUE)
unlink(libPath, recursive = TRUE)
},
add = TRUE
)

quietly(usethis::create_package(pkgPath, open = FALSE))
quietly(testthat::use_catch(pkgPath))

cat("LinkingTo: testthat",
file = file.path(pkgPath, "DESCRIPTION"),
append = TRUE,
sep = "\n")
cat(
"LinkingTo: testthat",
file = file.path(pkgPath, "DESCRIPTION"),
append = TRUE,
sep = "\n"
)

cat(
sprintf("useDynLib(%s, .registration=TRUE)", pkgName),
Expand All @@ -57,7 +47,7 @@ local({
)

if (!catchEnabled) {

isWindows <- Sys.info()[["sysname"]] == "Windows"
makevarsPath <- file.path(
pkgPath,
"src",
Expand All @@ -69,7 +59,6 @@ local({
file = makevarsPath,
sep = "\n"
)

}

install.packages(pkgs = pkgPath, repos = NULL, type = "source")
Expand All @@ -78,6 +67,7 @@ local({
pkgload::unload(pkgName)
}

withr::with_envvar(c(R_TESTS = ''), perform_test("testthatclient1", TRUE))
withr::with_envvar(c(R_TESTS = ''), perform_test("testthatclient2", FALSE))
withr::local_envvar(R_TESTS = '')
perform_test("testthatclient1", TRUE)
perform_test("testthatclient2", FALSE)
})
Loading