Changeset: adee98ccc4c6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=adee98ccc4c6 Modified Files: clients/R/Tests/deps-install.R clients/R/Tests/deps-test.R Branch: Jul2015 Log Message:
Make clients/R stuff in Jul2015 branch identical to default branch. diffs (26 lines): diff --git a/clients/R/Tests/deps-install.R b/clients/R/Tests/deps-install.R --- a/clients/R/Tests/deps-install.R +++ b/clients/R/Tests/deps-install.R @@ -1,7 +1,8 @@ # create lib folder if it should be missing to avoid the prompt dir.create(unlist(strsplit(Sys.getenv("R_LIBS_USER"), .Platform$path.sep))[1L], recursive = TRUE, showWarnings=F) + # autoinstall DBI and digest, we need those to install MonetDB.R -dd <- capture.output(suppressMessages(suppressWarnings( { +dd <- capture.output(suppressMessages(suppressWarnings({ (function(lp) { np <- lp[!(lp %in% installed.packages()[,"Package"])] repos <- "http://cran.rstudio.com/" @@ -10,4 +11,3 @@ dd <- capture.output(suppressMessages(su x <- lapply(lp,function(x){library(x,character.only=TRUE,quietly=T)}) })(c("DBI", "digest")) }))) - diff --git a/clients/R/Tests/deps-test.R b/clients/R/Tests/deps-test.R --- a/clients/R/Tests/deps-test.R +++ b/clients/R/Tests/deps-test.R @@ -8,4 +8,3 @@ dd <- capture.output(suppressMessages(su x <- lapply(lp,function(x){library(x,character.only=TRUE,quietly=T)}) })(c('Rcpp', 'dplyr','survey','sqlsurvey','Lahman','nycflights13')) }))) - _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list