Skip to content

Commit

Permalink
Merge pull request #1206 from RcppCore/feature/shorter_tests
Browse files Browse the repository at this point in the history
Limit testing scope to stay withing CRAN time buckets
  • Loading branch information
eddelbuettel authored Mar 13, 2022
2 parents f12d9fd + e389aab commit 136ec60
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 6 deletions.
8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2022-03-13 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION (Version, Date): Roll minor version
* inst/include/Rcpp/config.h: Idem

* tests/tinytest.R: Disable full tests on four-digits release to not
exceed CRAN test time preference

2022-03-10 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION (Version, Date): Roll minor version
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: Rcpp
Title: Seamless R and C++ Integration
Version: 1.0.8.2
Date: 2022-03-10
Version: 1.0.8.3
Date: 2022-03-13
Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
Nathan Russell, Inaki Ucar, Douglas Bates and John Chambers
Maintainer: Dirk Eddelbuettel <edd@debian.org>
Expand Down
4 changes: 3 additions & 1 deletion inst/NEWS.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
\newcommand{\ghpr}{\href{https://github.com/RcppCore/Rcpp/pull/#1}{##1}}
\newcommand{\ghit}{\href{https://github.com/RcppCore/Rcpp/issues/#1}{##1}}

\section{Changes in Rcpp hotfix release version 1.0.8.2 (2022-03-10)}{
\section{Changes in Rcpp hotfix release version 1.0.8.3 (2022-03-13)}{
\itemize{
\item Changes in Rcpp API:
\itemize{
Expand All @@ -22,6 +22,8 @@
\item Changes in Rcpp Deployment:
\itemize{
\item Accomodate four digit version numbers in unit test (Dirk)
\item Do not run complete test suite to limit test time to CRAN
preference (Dirk)
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions inst/include/Rcpp/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#define RCPP_VERSION_STRING "1.0.8"

// the current source snapshot (using four components, if a fifth is used in DESCRIPTION we ignore it)
#define RCPP_DEV_VERSION RcppDevVersion(1,0,8,2)
#define RCPP_DEV_VERSION_STRING "1.0.8.2"
#define RCPP_DEV_VERSION RcppDevVersion(1,0,8,3)
#define RCPP_DEV_VERSION_STRING "1.0.8.3"

#endif
2 changes: 1 addition & 1 deletion tests/tinytest.R
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if (requireNamespace("tinytest", quietly=TRUE)) {

## Force tests to be executed if in dev release which we define as
## having a sub-release, eg 0.9.15.5 is one whereas 0.9.16 is not
if (length(strsplit(packageDescription("Rcpp")$Version, "\\.")[[1]]) > 3) { # dev rel, and
if (FALSE && length(strsplit(packageDescription("Rcpp")$Version, "\\.")[[1]]) > 3) { # dev rel, and
if (Sys.getenv("RunAllRcppTests") != "no") { # if env.var not yet set
message("Setting \"RunAllRcppTests\"=\"yes\" for development release\n")
Sys.setenv("RunAllRcppTests"="yes")
Expand Down

0 comments on commit 136ec60

Please sign in to comment.