Changeset: 3a0e54355c30 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3a0e54355c30
Modified Files:
clients/R/Tests/All
clients/R/Tests/deps-install.R
clients/R/Tests/deps-test.R
testing/Mtest.py.in
Branch: Jul2015
Log Message:
On Windows, embedded R doesn't work, and we don't want to have to build
dependencies from source.
diffs (49 lines):
diff --git a/clients/R/Tests/All b/clients/R/Tests/All
--- a/clients/R/Tests/All
+++ b/clients/R/Tests/All
@@ -5,4 +5,4 @@ HAVE_LIBR?dbi
HAVE_LIBR?survey
HAVE_LIBR?dplyr
HAVE_LIBR?dplyr-flights
-HAVE_LIBR?dbapply
+HAVE_LIBR&NOT_WIN32?dbapply
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
@@ -6,8 +6,8 @@ dd <- capture.output(suppressMessages(su
(function(lp) {
np <- lp[!(lp %in% installed.packages()[,"Package"])]
repos <- "http://cran.rstudio.com/";
- if(length(np)) install.packages(np,repos=repos, type="source", quiet=T)
- update.packages(repos=repos, ask=F, oldPkgs=lp, type="source", quiet=T)
+ if(length(np)) install.packages(np,repos=repos, quiet=T)
+ update.packages(repos=repos, ask=F, oldPkgs=lp, quiet=T)
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
@@ -3,8 +3,8 @@ dd <- capture.output(suppressMessages(su
(function(lp) {
np <- lp[!(lp %in% installed.packages()[,"Package"])]
repos <-
c('http://download.r-forge.r-project.org','http://cran.rstudio.com/')
- if(length(np)) install.packages(np,repos=repos, type="source", quiet=T)
- update.packages(repos=repos, ask=F, oldPkgs=lp, type="source", quiet=T)
+ if(length(np)) install.packages(np,repos=repos, quiet=T)
+ update.packages(repos=repos, ask=F, oldPkgs=lp, quiet=T)
x <- lapply(lp,function(x){library(x,character.only=TRUE,quietly=T)})
})(c('Rcpp', 'dplyr','survey','sqlsurvey','Lahman','nycflights13'))
})))
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -2823,7 +2823,7 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR
Srvr.extend(PROLOGUE)
# enable r integration in server
- if CONDITIONALS['HAVE_LIBR']:
+ if CONDITIONALS['HAVE_LIBR'] and CONDITIONALS['NOT_WIN32']:
Srvr.extend(['--set', 'embedded_r=yes'])
pSrvr, pSrvrTimer = LaunchIt(Srvr,
'\nio.printf("\\nReady.\\n");\n', SrvrOut, SrvrErr, TIMEOUT)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
