Skip to content

Commit e4e0f8f

Browse files
committed
finer-grained skip message
1 parent 4c0c821 commit e4e0f8f

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

ChangeLog

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
2019-12-07 Dirk Eddelbuettel <[email protected]>
22

3+
* inst/tinytest/test_binary_package.R: Finer-grained skip messages
4+
35
* inst/tinytest/test_misc.R: Add commented-out test that fails
46
* tests/tinytest.R: Minor edit
57

inst/tinytest/test_binary_package.R

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020

2121
.onTravis <- Sys.getenv("TRAVIS") != ""
2222

23-
.runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
24-
25-
## override -- skipping test for now (need to rebuild binary)
26-
.runThisTest <- FALSE
27-
23+
.runThisTest <- Sys.getenv("RunAllRcppTests") == "yes" && Sys.getenv("RunVerboseRcppTests") == "yes"
2824

2925
##test.binary.testRcppPackage <- function() {
3026

31-
if (!(.runThisTest && .onLinux && !.onTravis)) exit_file("Skipping 'test_binary_package.R'")
27+
if (! .runThisTest) exit_file("Set 'RunVerboseRcppTests' and 'RunAllRcppTests' to 'yes' to run.")
28+
if (! .onLinux) exit_file("Only running this on Linux.'")
29+
if (.onTravis) exit_file("Not running on Travis.")
30+
31+
exit_file("Skipping for now as underlying binary needs to be updated.")
3232

3333
debpkg <- "r-cran-testrcpppackage"
3434
rpkg <- "testRcppPackage"

0 commit comments

Comments
 (0)