Skip to content

Commit 4c0c821

Browse files
committed
two minor edits to test files, no behavior change
1 parent d0b4106 commit 4c0c821

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2019-12-07 Dirk Eddelbuettel <[email protected]>
2+
3+
* inst/tinytest/test_misc.R: Add commented-out test that fails
4+
* tests/tinytest.R: Minor edit
5+
16
2019-12-05 Dirk Eddelbuettel <[email protected]>
27

38
* vignettes/rmd/Rcpp-FAQ.Rmd (Rcpp): Add entry about "'dataptr' (or

inst/tinytest/test_misc.R

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,3 +181,7 @@ expect_true(nchar(Rcpp:::bib()) > 0, info="bib file")
181181
# test.getRcppVersion <- function() {
182182
expect_true(inherits(getRcppVersion(), "package_version"), info="package_version object")
183183
expect_true(getRcppVersion(devel=TRUE) >= getRcppVersion(devel=FALSE), info="dev greater equal release")
184+
185+
## if need be it can be useful to fail to test e.g. the Docker setup
186+
## commented out now as we prefer to pass when not debugging ;-)
187+
# expect_true(FALSE, info="oh noes")

tests/tinytest.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ if (requireNamespace("tinytest", quietly=TRUE) &&
1010

1111
## Force tests to be executed if in dev release which we define as
1212
## having a sub-release, eg 0.9.15.5 is one whereas 0.9.16 is not
13-
if (length(strsplit(packageDescription("Rcpp")$Version, "\\.")[[1]]) > 3) { # dev release, and
14-
if (Sys.getenv("RunAllRcppTests") != "no") { # if env.var not yet set
13+
if (length(strsplit(packageDescription("Rcpp")$Version, "\\.")[[1]]) > 3) { # dev rel, and
14+
if (Sys.getenv("RunAllRcppTests") != "no") { # if env.var not yet set
1515
message("Setting \"RunAllRcppTests\"=\"yes\" for development release\n")
1616
Sys.setenv("RunAllRcppTests"="yes")
1717
}
@@ -22,7 +22,7 @@ if (requireNamespace("tinytest", quietly=TRUE) &&
2222
if ((Sys.getenv("CI") == "true") ||
2323
(Sys.getenv("TRAVIS") == "true") ||
2424
(Sys.getenv("CONTINUOUS_INTEGRATION") == "true")) {
25-
if (Sys.getenv("RunAllRcppTests") != "no") { # if env.var not yet set
25+
if (Sys.getenv("RunAllRcppTests") != "no") { # if env.var not yet set
2626
message("Always enabling \"RunAllRcppTests\"=\"yes\" on Travis\n")
2727
Sys.setenv("RunAllRcppTests"="yes")
2828
}

0 commit comments

Comments
 (0)