MonetDB: Jun2016 - R client, reflecting changes on package attac...

[Hannes Muehleisen]

Changeset: 8eaea6e500ed for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8eaea6e500ed
Modified Files:
        clients/R/Tests/All
        clients/R/Tests/dbapply.R
        clients/R/Tests/dbi.R
        clients/R/Tests/dplyr.R
Branch: Jun2016
Log Message:

R client, reflecting changes on package attachment


diffs (44 lines):

diff --git a/clients/R/Tests/All b/clients/R/Tests/All
--- a/clients/R/Tests/All
+++ b/clients/R/Tests/All
@@ -1,6 +1,6 @@
 HAVE_LIBR?deps-install
+HAVE_LIBR?install
 HAVE_LIBR?deps-test
-HAVE_LIBR?install
 HAVE_LIBR?dbi
 HAVE_LIBR?survey
 HAVE_LIBR?dplyr
diff --git a/clients/R/Tests/dbapply.R b/clients/R/Tests/dbapply.R
--- a/clients/R/Tests/dbapply.R
+++ b/clients/R/Tests/dbapply.R
@@ -1,6 +1,5 @@
-ll <- NULL
 if (Sys.getenv("TSTTRGDIR") != "") {
-       ll <- paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")
+       .libPaths(c(.libPaths(), paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")))
 }
 library(DBI, quietly = T)
 
diff --git a/clients/R/Tests/dbi.R b/clients/R/Tests/dbi.R
--- a/clients/R/Tests/dbi.R
+++ b/clients/R/Tests/dbi.R
@@ -1,6 +1,5 @@
-ll <- NULL
 if (Sys.getenv("TSTTRGDIR") != "") {
-       ll <- paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")
+       .libPaths(c(.libPaths(), paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")))
 }
 library(DBI)
 
diff --git a/clients/R/Tests/dplyr.R b/clients/R/Tests/dplyr.R
--- a/clients/R/Tests/dplyr.R
+++ b/clients/R/Tests/dplyr.R
@@ -1,6 +1,5 @@
-ll <- NULL
 if (Sys.getenv("TSTTRGDIR") != "") {
-       ll <- paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")
+       .libPaths(c(.libPaths(), paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")))
 }
 ff <- textConnection("asdf", open="w")
 # hide output from connect and attach since it would blow up the test output
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list