Skip to content

Commit 6192ebf

Browse files
another iteration of make check locally
1 parent 6fb6dcb commit 6192ebf

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/library/methods/man/hasArg.Rd

+2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ ftest(1) ## c(TRUE, FALSE)
3939
ftest(1, 2) ## c(TRUE, FALSE)
4040
ftest(y2 = 2) ## c(FALSE, TRUE)
4141
ftest(y = 2) ## c(FALSE, FALSE) (no partial matching)
42+
\dontshow{ old <- options(warnPartialMatchArgs=FALSE) }
4243
ftest(y2 = 2, x = 1) ## c(TRUE, TRUE) partial match x1
44+
\dontshow{ options(old) }
4345
}
4446
\keyword{ programming }

tests/reg-tests-1d.R

+3-3
Original file line numberDiff line numberDiff line change
@@ -2676,9 +2676,9 @@ identNoE <- function(x,y, ...) identical(x,y, ignore.environment=TRUE, ...)
26762676
stopifnot(exprs = {
26772677
all.equal(fq1[keep], fqP[keep])
26782678
## quasi() failed badly "switch(vtemp, ... EXPR must be a length 1 vector" in R <= 3.6.0
2679-
identNoE(quasi(var = mu), quasi(variance = "mu"))
2680-
identNoE(quasi(var = mu(1-mu)), quasi(variance = "mu(1- mu)"))# both failed in R <= 3.6.0
2681-
identNoE(quasi(var = mu^3), quasi(variance = "mu ^ 3")) # 2nd failed in R <= 3.6.0
2679+
identNoE(quasi(variance = mu), quasi(variance = "mu"))
2680+
identNoE(quasi(variance = mu(1-mu)), quasi(variance = "mu(1- mu)"))# both failed in R <= 3.6.0
2681+
identNoE(quasi(variance = mu^3), quasi(variance = "mu ^ 3")) # 2nd failed in R <= 3.6.0
26822682
is.character(msg <- tryCmsg(quasi(variance = "log(mu)"))) &&
26832683
grepl("variance.*log\\(mu\\).* invalid", msg) ## R <= 3.6.0: 'variance' "NA" is invalid
26842684
})

0 commit comments

Comments
 (0)