diff --git a/tests/crs.R b/tests/crs.R index f36871f07..0dfaf8494 100644 --- a/tests/crs.R +++ b/tests/crs.R @@ -30,11 +30,6 @@ suppressWarnings( sf_project("+proj=longlat", "+proj=lcc +lat_1=30 +lat_2=60", cbind(c(0,0),c(-80,-90)), keep = TRUE) ) st_transform(st_sfc(st_point(c(0,0)), st_point(c(1,1)), crs = 4326), 3857) -if (Sys.getenv("USER") %in% c("edzer", "travis")) { # causes memory leaks: - stopifnot(inherits(try(sf_project("+proj=longlat", "+proj=bar", matrix(1:4,2)), silent = TRUE), "try-error")) - stopifnot(inherits(try(sf_project("+proj=foo", "+proj=longlat", matrix(1:4,2)), silent = TRUE), "try-error")) -} - if (sf_extSoftVersion()["USE_PROJ_H"] == "true" || sf_proj_info("have_datum_files")) { "datum files installed" } else { diff --git a/tests/crs.Rout.save b/tests/crs.Rout.save index 1747b30cd..22ff8f448 100644 --- a/tests/crs.Rout.save +++ b/tests/crs.Rout.save @@ -70,13 +70,6 @@ Bounding box: xmin: 0 ymin: 0 xmax: 111319.5 ymax: 111325.1 Projected CRS: WGS 84 / Pseudo-Mercator POINT (0 0) POINT (111319.5 111325.1) -> if (Sys.getenv("USER") %in% c("edzer", "travis")) { # causes memory leaks: -+ stopifnot(inherits(try(sf_project("+proj=longlat", "+proj=bar", matrix(1:4,2)), silent = TRUE), "try-error")) -+ stopifnot(inherits(try(sf_project("+proj=foo", "+proj=longlat", matrix(1:4,2)), silent = TRUE), "try-error")) -+ } -proj_create: Error 1027 (Invalid value for an argument): Unknown projection -proj_create: Error 1027 (Invalid value for an argument): Unknown projection -> > if (sf_extSoftVersion()["USE_PROJ_H"] == "true" || sf_proj_info("have_datum_files")) { + "datum files installed" + } else { @@ -100,4 +93,4 @@ proj_create: Error 1027 (Invalid value for an argument): Unknown projection > > proc.time() user system elapsed - 0.626 1.357 0.510 + 0.750 1.093 0.700