[Rcpp-commits] r3428 - in pkg/RcppArmadillo: . inst/unitTests

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

Author: edd
Date: 2011-12-23 14:52:38 +0100 (Fri, 23 Dec 2011)
New Revision: 3428

Modified:
   pkg/RcppArmadillo/ChangeLog
   pkg/RcppArmadillo/inst/unitTests/runTests.R
Log:
modify fallback location of unitTest output files to be the RcppArmadillo.Rcheck/ dir


Modified: pkg/RcppArmadillo/ChangeLog
===================================================================
--- pkg/RcppArmadillo/ChangeLog	2011-12-23 13:50:47 UTC (rev 3427)
+++ pkg/RcppArmadillo/ChangeLog	2011-12-23 13:52:38 UTC (rev 3428)
@@ -1,3 +1,8 @@
+2011-12-23  Dirk Eddelbuettel  <edd at debian.org>
+
+	* inst/unitTests/runTests.R: unit tests output 'fallback' directory
+	changed to '..' and files are now in top-level of $pkg.Rcheck/
+
 2011-12-13  Dirk Eddelbuettel  <edd at debian.org>
 
 	* man/RcppArmadillo-package.Rd: Updated to current version number,
@@ -8,7 +13,6 @@
 	* DESCRIPTION: Release 0.2.34
 
 	* inst/include/*: Upgraded to new release 2.4.2 of Armadillo
-	* 
 
 2011-12-07  Dirk Eddelbuettel  <edd at debian.org>
 

Modified: pkg/RcppArmadillo/inst/unitTests/runTests.R
===================================================================
--- pkg/RcppArmadillo/inst/unitTests/runTests.R	2011-12-23 13:50:47 UTC (rev 3427)
+++ pkg/RcppArmadillo/inst/unitTests/runTests.R	2011-12-23 13:52:38 UTC (rev 3428)
@@ -63,16 +63,11 @@
         	} else {
         	    ## Rscript
         	    output <- process_args(commandArgs(TRUE))
-        	} 
+        	}
         }
 
-        # if it did not work, try to use /tmp
-        if( is.null(output) ){
-            if( file.exists( "/tmp" ) ){
-                output <- "/tmp"
-            } else{
-                output <- getwd()
-            }
+        if( is.null(output) ) {         # if it did not work, use parent dir
+            output <- ".."              # as BDR does not want /tmp to be used
         }
 
         ## Print results