[Rcpp-commits] r4538 - in pkg/Rcpp: . inst vignettes vignettes/notyet

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Fri Sep 27 21:30:44 CEST 2013


Author: edd
Date: 2013-09-27 21:30:44 +0200 (Fri, 27 Sep 2013)
New Revision: 4538

Added:
   pkg/Rcpp/vignettes/Rcpp-unitTests.Rnw
Removed:
   pkg/Rcpp/vignettes/notyet/Rcpp-unitTests.Rnw
Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/DESCRIPTION
   pkg/Rcpp/inst/NEWS.Rd
Log:
re-activated unitTests vignette, bumbed pre-release version


Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2013-09-27 15:11:20 UTC (rev 4537)
+++ pkg/Rcpp/ChangeLog	2013-09-27 19:30:44 UTC (rev 4538)
@@ -1,3 +1,8 @@
+2013-09-27  Dirk Eddelbuettel  <edd at debian.org>
+
+	* vignettes/Rcpp-unitTests.Rnw: Re-activated vignette
+        * DESCRIPTION: Version number bumped to 0.10.4.6
+
 2013-09-27 Romain Francois <romain at r-enthusiasts.com>
 
         * include/Rcpp/module/Module_generated_CppFunction.h : regenerated to 

Modified: pkg/Rcpp/DESCRIPTION
===================================================================
--- pkg/Rcpp/DESCRIPTION	2013-09-27 15:11:20 UTC (rev 4537)
+++ pkg/Rcpp/DESCRIPTION	2013-09-27 19:30:44 UTC (rev 4538)
@@ -1,6 +1,6 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.10.4.5
+Version: 0.10.4.6
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois, with contributions 
  by Douglas Bates, John Chambers and JJ Allaire

Modified: pkg/Rcpp/inst/NEWS.Rd
===================================================================
--- pkg/Rcpp/inst/NEWS.Rd	2013-09-27 15:11:20 UTC (rev 4537)
+++ pkg/Rcpp/inst/NEWS.Rd	2013-09-27 19:30:44 UTC (rev 4538)
@@ -75,8 +75,6 @@
     \itemize{
       \item The vignettes have been moved from \code{inst/doc/} to the
       \code{vignettes} directory which is now preferred.
-      \item The unitTest vignette has been disabled as no longer builds
-      when called from \code{R CMD check}.
       \item The appearance of the vignettes has been refreshed by
       switching to the Bistream Charter font, and microtype package.
     }

Copied: pkg/Rcpp/vignettes/Rcpp-unitTests.Rnw (from rev 4536, pkg/Rcpp/vignettes/notyet/Rcpp-unitTests.Rnw)
===================================================================
--- pkg/Rcpp/vignettes/Rcpp-unitTests.Rnw	                        (rev 0)
+++ pkg/Rcpp/vignettes/Rcpp-unitTests.Rnw	2013-09-27 19:30:44 UTC (rev 4538)
@@ -0,0 +1,69 @@
+\documentclass[10pt]{article}
+%\VignetteIndexEntry{Rcpp-unitTests}
+%\VignetteKeywords{R,Rcpp,unit tests}
+%\VignettePackage{Rcpp}
+
+\usepackage{vmargin}
+\setmargrb{0.75in}{0.75in}{0.75in}{0.75in}
+
+\RequirePackage{ae,mathpple}    % ae as a default font pkg works with Sweave
+\RequirePackage[T1]{fontenc}
+
+<<echo=FALSE,print=FALSE>>=
+require(Rcpp)
+prettyVersion <- packageDescription("Rcpp")$Version
+prettyDate <- format(Sys.Date(), "%B %e, %Y")
+library(RUnit)
+@
+
+\usepackage[colorlinks]{hyperref}
+\author{Dirk Eddelbuettel \and Romain Fran\c{c}ois}
+\title{\textbf{Rcpp}: Unit testing results}
+\date{Rcpp version \Sexpr{prettyVersion} as of \Sexpr{prettyDate}}
+
+\begin{document}
+\maketitle
+
+\section*{Test Execution}
+
+<<unitTesting,echo=FALSE,print=FALSE>>=
+pkg <- "Rcpp"
+
+## Make sure we run all tests for the vignette
+Sys.setenv("RunAllRcppTests"="yes")
+
+if (file.exists("unitTests-results")) unlink("unitTests-results", recursive = TRUE)
+dir.create("unitTests-results")
+pathRcppTests <<- system.file("unitTests", package = pkg)
+path <- system.file("unitTests", package=pkg)
+testSuite <- defineTestSuite(name=paste(pkg, "unit testing"), dirs=path)
+tests <- runTestSuite(testSuite)
+err <- getErrors(tests)
+if (err$nFail > 0) stop(sprintf("unit test problems: %d failures", err$nFail))
+if (err$nErr > 0) stop( sprintf("unit test problems: %d errors", err$nErr))
+printHTMLProtocol(tests, fileName=sprintf("unitTests-results/%s-unitTests.html", pkg))
+printTextProtocol(tests, fileName=sprintf("unitTests-results/%s-unitTests.txt" , pkg))
+
+if (file.exists("/tmp")) {
+    invisible(sapply(c("txt", "html"), function(ext) {
+        fname <- sprintf("unitTests-results/%s-unitTests.%s", pkg, ext)
+        file.copy(fname, "/tmp", overwrite=TRUE)
+    }))
+}
+@
+
+\section*{Test Results}
+
+\begin{verbatim}
+<<importResults,echo=FALSE,results=tex>>=
+results <- "unitTests-results/Rcpp-unitTests.txt"
+if (file.exists(results)) {
+    writeLines(readLines(results))
+} else{
+    writeLines( "unit test results not available" )
+}
+@
+
+\end{verbatim}
+
+\end{document}

Deleted: pkg/Rcpp/vignettes/notyet/Rcpp-unitTests.Rnw
===================================================================
--- pkg/Rcpp/vignettes/notyet/Rcpp-unitTests.Rnw	2013-09-27 15:11:20 UTC (rev 4537)
+++ pkg/Rcpp/vignettes/notyet/Rcpp-unitTests.Rnw	2013-09-27 19:30:44 UTC (rev 4538)
@@ -1,69 +0,0 @@
-\documentclass[10pt]{article}
-%\VignetteIndexEntry{Rcpp-unitTests}
-%\VignetteKeywords{R,Rcpp,unit tests}
-%\VignettePackage{Rcpp}
-
-\usepackage{vmargin}
-\setmargrb{0.75in}{0.75in}{0.75in}{0.75in}
-
-\RequirePackage{ae,mathpple}    % ae as a default font pkg works with Sweave
-\RequirePackage[T1]{fontenc}
-
-<<echo=FALSE,print=FALSE>>=
-require(Rcpp)
-prettyVersion <- packageDescription("Rcpp")$Version
-prettyDate <- format(Sys.Date(), "%B %e, %Y")
-library(RUnit)
-@
-
-\usepackage[colorlinks]{hyperref}
-\author{Dirk Eddelbuettel \and Romain Fran\c{c}ois}
-\title{\textbf{Rcpp}: Unit testing results}
-\date{Rcpp version \Sexpr{prettyVersion} as of \Sexpr{prettyDate}}
-
-\begin{document}
-\maketitle
-
-\section*{Test Execution}
-
-<<unitTesting,echo=FALSE,print=FALSE>>=
-pkg <- "Rcpp"
-
-## Make sure we run all tests for the vignette
-Sys.setenv("RunAllRcppTests"="yes")
-
-if (file.exists("unitTests-results")) unlink("unitTests-results", recursive = TRUE)
-dir.create("unitTests-results")
-pathRcppTests <<- system.file("unitTests", package = pkg)
-path <- system.file("unitTests", package=pkg)
-testSuite <- defineTestSuite(name=paste(pkg, "unit testing"), dirs=path)
-tests <- runTestSuite(testSuite)
-err <- getErrors(tests)
-if (err$nFail > 0) stop(sprintf("unit test problems: %d failures", err$nFail))
-if (err$nErr > 0) stop( sprintf("unit test problems: %d errors", err$nErr))
-printHTMLProtocol(tests, fileName=sprintf("unitTests-results/%s-unitTests.html", pkg))
-printTextProtocol(tests, fileName=sprintf("unitTests-results/%s-unitTests.txt" , pkg))
-
-if (file.exists("/tmp")) {
-    invisible(sapply(c("txt", "html"), function(ext) {
-        fname <- sprintf("unitTests-results/%s-unitTests.%s", pkg, ext)
-        file.copy(fname, "/tmp", overwrite=TRUE)
-    }))
-}
-@
-
-\section*{Test Results}
-
-\begin{verbatim}
-<<importResults,echo=FALSE,results=tex>>=
-results <- "unitTests-results/Rcpp-unitTests.txt"
-if (file.exists(results)) {
-    writeLines(readLines(results))
-} else{
-    writeLines( "unit test results not available" )
-}
-@
-
-\end{verbatim}
-
-\end{document}



More information about the Rcpp-commits mailing list