Skip to content

Commit ea4cd32

Browse files
committed
finer grained test message
1 parent e841f98 commit ea4cd32

File tree

5 files changed

+11
-20
lines changed

5 files changed

+11
-20
lines changed

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
* inst/tinytest/test_client_package.R: Finer-grained skip messages
44
* inst/tinytest/test_module_client_package.R: Idem
5+
* inst/tinytest/test_expose_class.R: Idem
6+
* inst/tinytest/test_interface.R: Idem
7+
* inst/tinytest/test_rcpp_package_skeleton.R: Idem
8+
* inst/tinytest/test_reference.R: Idem
59

610
* src/attributes.cpp: Remove dangling '#nocov end'
711

inst/tinytest/test_expose_class.R

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@
1616
## You should have received a copy of the GNU General Public License
1717
## along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
1818

19-
.runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
19+
.runThisTest <- Sys.getenv("RunAllRcppTests") == "yes" && Sys.getenv("RunVerboseRcppTests") == "yes"
2020

21-
## override -- skipping test for now
22-
.runThisTest <- FALSE
23-
24-
if (!.runThisTest) exit_file("Skipping 'test_expose_class.R'")
21+
if (! .runThisTest) exit_file("Set 'RunVerboseRcppTests' and 'RunAllRcppTests' to 'yes' to run.")
2522

2623
library(Rcpp)
2724

inst/tinytest/test_interface.R

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@
1616
## You should have received a copy of the GNU General Public License
1717
## along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
1818

19-
.runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
19+
.runThisTest <- Sys.getenv("RunAllRcppTests") == "yes" && Sys.getenv("RunVerboseRcppTests") == "yes"
2020

21-
## override -- skipping test for now as noisy
22-
.runThisTest <- FALSE
23-
24-
if (!.runThisTest) exit_file("Skipping 'test_interface.R'")
21+
if (! .runThisTest) exit_file("Set 'RunVerboseRcppTests' and 'RunAllRcppTests' to 'yes' to run.")
2522

2623
library(Rcpp)
2724

inst/tinytest/test_rcpp_package_skeleton.R

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@
1616
## You should have received a copy of the GNU General Public License
1717
## along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
1818

19-
.runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
19+
.runThisTest <- Sys.getenv("RunAllRcppTests") == "yes" && Sys.getenv("RunVerboseRcppTests") == "yes"
2020

21-
## override -- skipping test for now (need to rebuild binary)
22-
.runThisTest <- FALSE
23-
24-
if (!.runThisTest) exit_file("Skipping 'test_rcpp_package_skeleton'") #, set 'RunAllRcppTests=yes' to run.")
21+
if (! .runThisTest) exit_file("Set 'RunVerboseRcppTests' and 'RunAllRcppTests' to 'yes' to run.")
2522

2623
library(Rcpp)
2724

inst/tinytest/test_reference.R

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@
1717
## along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
1818

1919
.runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
20-
21-
## override -- skipping test for now (need to rebuild binary)
22-
.runThisTest <- FALSE
23-
24-
if (!.runThisTest) exit_file("Skipping 'test_reference.R'") #, set 'RunAllRcppTests=yes' to run.")
20+
if (! .runThisTest) exit_file("Set 'RunAllRcppTests' to 'yes' to run.")
2521

2622
library(Rcpp)
2723
sourceCpp("cpp/Reference.cpp")

0 commit comments

Comments
 (0)