[Rcpp-commits] r1553 - in pkg/RcppArmadillo: inst/unitTests tests

[noreply at r-forge.r-project.org]

Author: romain
Date: 2010-06-16 14:51:18 +0200 (Wed, 16 Jun 2010)
New Revision: 1553

Modified:
   pkg/RcppArmadillo/inst/unitTests/runTests.R
   pkg/RcppArmadillo/tests/doRUnit.R
Log:
keeping RUnit results in the RcppArmadillo.Rcheck directory on R CMD check

Modified: pkg/RcppArmadillo/inst/unitTests/runTests.R
===================================================================
--- pkg/RcppArmadillo/inst/unitTests/runTests.R	2010-06-16 12:40:17 UTC (rev 1552)
+++ pkg/RcppArmadillo/inst/unitTests/runTests.R	2010-06-16 12:51:18 UTC (rev 1553)
@@ -49,15 +49,21 @@
             }
         }
 
-        # give a chance to the user to customize where he/she wants
-        # the unit tests results to be stored with the --output= command
-        # line argument
-        if( exists( "argv",  globalenv() ) ){
-            ## littler
-            output <- process_args(argv)
-        } else {
-            ## Rscript
-            output <- process_args(commandArgs(TRUE))
+        # R CMD check uses this
+        if( exists( "RcppArmadillo.unit.test.output.dir", globalenv() ) ){
+			output <- RcppArmadillo.unit.test.output.dir
+		} else {
+
+			# give a chance to the user to customize where he/she wants
+        	# the unit tests results to be stored with the --output= command
+        	# line argument
+        	if( exists( "argv",  globalenv() ) ){
+        	    ## littler
+        	    output <- process_args(argv)
+        	} else {
+        	    ## Rscript
+        	    output <- process_args(commandArgs(TRUE))
+        	} 
         }
 
         # if it did not work, try to use /tmp

Modified: pkg/RcppArmadillo/tests/doRUnit.R
===================================================================
--- pkg/RcppArmadillo/tests/doRUnit.R	2010-06-16 12:40:17 UTC (rev 1552)
+++ pkg/RcppArmadillo/tests/doRUnit.R	2010-06-16 12:51:18 UTC (rev 1553)
@@ -24,7 +24,7 @@
     ## without this, we get unit test failures
     Sys.setenv( R_TESTS = "" )
 
-    Rcpp.unit.test.output.dir <- getwd()
+    RcppArmadillo.unit.test.output.dir <- getwd()
 
     source(file.path(path, "runTests.R"), echo = TRUE)