[Rcpp-commits] r3426 - in pkg/RcppClassic: . inst/unitTests

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

Author: edd
Date: 2011-12-23 14:36:03 +0100 (Fri, 23 Dec 2011)
New Revision: 3426

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


Modified: pkg/RcppClassic/ChangeLog
===================================================================
--- pkg/RcppClassic/ChangeLog	2011-12-22 18:44:21 UTC (rev 3425)
+++ pkg/RcppClassic/ChangeLog	2011-12-23 13:36:03 UTC (rev 3426)
@@ -1,6 +1,11 @@
+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-04-07  Dirk Eddelbuettel  <edd at debian.org>
 
-	* inst/unitTests/runit.RcppDate.R: Once again Comment-out
+	* inst/unitTests/runit.RcppDate.R: Once again comment-out
 	test.RcppDatetime.get.functions() as it fails with different TZ values
 
 2011-04-06  Dirk Eddelbuettel  <edd at debian.org>

Modified: pkg/RcppClassic/inst/unitTests/runTests.R
===================================================================
--- pkg/RcppClassic/inst/unitTests/runTests.R	2011-12-22 18:44:21 UTC (rev 3425)
+++ pkg/RcppClassic/inst/unitTests/runTests.R	2011-12-23 13:36:03 UTC (rev 3426)
@@ -1,6 +1,6 @@
 ## -*- mode: R; tab-width: 4 -*-
 ##
-## Copyright (C) 2009 - 2010	Dirk Eddelbuettel and Romain Francois
+## Copyright (C) 2009 - 2011	Dirk Eddelbuettel and Romain Francois
 ##
 ## This file is part of RcppClassic.
 ##
@@ -27,7 +27,7 @@
     stop( "RcppClassic unit tests need at least the version 0.3.4.4 of inline" )
 }
 
-if(require("RUnit", quietly = TRUE)) {
+if (require("RUnit", quietly = TRUE)) {
 
     is_local <- function(){
     	if( exists( "argv", globalenv() ) && "--local" %in% argv ) return(TRUE)
@@ -103,13 +103,8 @@
             }
         }
 
-                                        # 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