[Rcpp-commits] r3483 - in pkg/Rcpp: R inst/unitTests

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

Author: edd
Date: 2012-02-16 22:04:54 +0100 (Thu, 16 Feb 2012)
New Revision: 3483

Modified:
   pkg/Rcpp/R/tools.R
   pkg/Rcpp/inst/unitTests/runit.Module.client.package.R
Log:
and reeabling the test 
AND turning off assignInMyNamespace iff R 2.15 used as I misunderstand what its 'My' was


Modified: pkg/Rcpp/R/tools.R
===================================================================
--- pkg/Rcpp/R/tools.R	2012-02-16 20:55:38 UTC (rev 3482)
+++ pkg/Rcpp/R/tools.R	2012-02-16 21:04:54 UTC (rev 3483)
@@ -21,9 +21,9 @@
 
 # just like assignInNamespace but first checks that the binding exists
 forceAssignInNamespace <- function( x, value, env ){
-    if (getRversion() >= "2.15.0") {
-        assignInMyNamespace(x, value)
-    } else {
+    #if (getRversion() >= "2.15.0") {
+    #    assignInMyNamespace(x, value)
+    #} else {
         is_ns <- isNamespace( env )
         if( is_ns && exists( x, env ) && bindingIsLocked(x, env ) ){
             unlockBinding( x, env )
@@ -32,5 +32,5 @@
         if( is_ns ){
             lockBinding( x, env )
         }
-    }
+    #}
 }

Modified: pkg/Rcpp/inst/unitTests/runit.Module.client.package.R
===================================================================
--- pkg/Rcpp/inst/unitTests/runit.Module.client.package.R	2012-02-16 20:55:38 UTC (rev 3482)
+++ pkg/Rcpp/inst/unitTests/runit.Module.client.package.R	2012-02-16 21:04:54 UTC (rev 3483)
@@ -32,7 +32,7 @@
 .onWindows <- .Platform$OS.type == "windows"
 
 ## Disabling this test for now as it fails in R-devel
-.runThisTest <- FALSE
+.runThisTest <- TRUE
 
 if (.runThisTest && Rcpp:::capabilities()[["Rcpp modules"]] && ! .badOSX && ! .onWindows) {