[Lme4-commits] r1812 - pkgtests

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

Author: bbolker
Date: 2013-04-24 23:26:57 +0200 (Wed, 24 Apr 2013)
New Revision: 1812

Modified:
   pkgtests/lme4depfuns.R
   pkgtests/lme4deptests.R
Log:
still working on dependency checking ..



Modified: pkgtests/lme4depfuns.R
===================================================================
--- pkgtests/lme4depfuns.R	2013-04-24 21:00:48 UTC (rev 1811)
+++ pkgtests/lme4depfuns.R	2013-04-24 21:26:57 UTC (rev 1812)
@@ -20,10 +20,12 @@
         if (verbose) cat("getting list of available packages from R-forge\n")
         availRforge <<- available.packages(contriburl=contrib.url(rforge))
     }
-    .libPaths(libdir)
+    ## FIXME: maybe this is not effective/not what we want to do?
+    ##  *don't* want to look at any already-installed packages
+    .libPaths(libdir) 
     ## we definitely want this to check for packages in the local library directory;
     ## not sure if we want to check in the rest of the standard library paths
-    instPkgs <- installed.packages()
+    instPkgs <- installed.packages(lib.loc=libdir)
     if (verbose) cat("checking package",pn,"\n")
     loc <- "none"  ## where is the package coming from?
     if (pn %in% rownames(availRforge)) {
@@ -75,7 +77,7 @@
             if (verbose) cat("installing dependencies",depMiss,"\n")
             install.packages(depMiss,lib=libdir)
             rPath <- if (loc=="CRAN") getOption("repos") else c(rforge,getOption("repos"))
-            instPkgs <- installed.packages(noCache=TRUE)  ## update installed package info
+            instPkgs <- installed.packages(noCache=TRUE,lib.loc=libdir)  ## update installed package info
         }
     }
     ## must have set check.Renviron here in order for R CMD check to respect libdir

Modified: pkgtests/lme4deptests.R
===================================================================
--- pkgtests/lme4deptests.R	2013-04-24 21:00:48 UTC (rev 1811)
+++ pkgtests/lme4deptests.R	2013-04-24 21:26:57 UTC (rev 1812)
@@ -68,6 +68,10 @@
 
 require(parallel)
 ## FIXME (maybe): mclapply doesn't work on Windows ?
+##  and might hang Ubuntu VM?
+
+## FIXME: not sure this is necessary/functional
+Sys.setenv(R_LIBS_SITE="./library")
 testresults <- mclapply(pkgnames,function(x) {
     if (verbose) cat("checking package",x,"\n")
     try(checkPkg(x,verbose=TRUE))