Correctly transfer 'install.fastr.packages' from FastR to GnuR.

Author: fangerer

com.oracle.truffle.r.test.packages/pkgtest/__init__.py

@@ -95,6 +95,17 @@ def _installpkgs_script():
     return join(packages_test, 'r', 'install.packages.R')
 
 
+def commit_fastr_builtins():
+    '''
+    There are some FastR builtins which we also want to use in GnuR (i.e. 'install.fastr.packages').
+    This function deparses these functions and writes them into a file which is then loaded by GnuR.
+    '''
+    dest_file = join(_packages_test_project_dir(), 'r', 'fastr.functions.rdx')
+    cmd_line = [get_fastr_rscript(), "--silent", "-e", '{ fastrRepoPath <- NULL; save(fastrRepoPath, install.fastr.packages, file="%s") }' % dest_file]
+    logging.debug("Generating fastr.functions.R: " + str(cmd_line))
+    return pkgtest_run(cmd_line)
+
+
 def _installpkgs(args, **kwargs):
     '''
     Runs the R script that does package/installation and testing.
@@ -164,6 +175,9 @@ def pkgtest(args):
     env['FASTR_OPTION_PrintErrorStacktracesToFile'] = 'false'
     env['FASTR_OPTION_PrintErrorStacktraces'] = 'true'
 
+    # transfer required FastR functions to GnuR
+    commit_fastr_builtins()
+
     # If '--cache-pkgs' is set, then also set the native API version value
     _set_pkg_cache_api_version(install_args, get_fastr_include_path())
 

com.oracle.truffle.r.test.packages/r/install.cache.R

@@ -712,12 +712,6 @@ transitive.dependencies <- function(pkg, lib, pl = as.data.frame(available.packa
 
 pkg.cache.in.overrides <- function(pkgname) pkgname %in% (if(is.fastr()) overrides$fastr else overrides$gnur)
 
-
-# TODO: currently just a workaround for GnuR; we should use same code as in FastR
-if (!exists("install.fastr.packages")) {
-    install.fastr.packages <<- install.packages
-}
-
 # Fetches the package from the cache or installs it. This is also done for all transitive dependencies.
 pkg.cache.internal.install <- function(pkg.cache.env, pkgname, contriburl, lib.install) {
     tryCatch({
@@ -778,3 +772,4 @@ pkg.cache.internal.install <- function(pkg.cache.env, pkgname, contriburl, lib.i
         return (1L)
     })
 }
+

com.oracle.truffle.r.test.packages/r/install.packages.R

@@ -1258,6 +1258,15 @@ run <- function() {
 curScriptDir <- getCurrentScriptDir()
 if (!is.null(curScriptDir)) {
     source(file.path(curScriptDir, "install.cache.R"))
+    if (!is.fastr()) {
+        fastr.functions.path <- file.path(curScriptDir, "fastr.functions.rdx")
+        if (file.exists(fastr.functions.path)) {
+            loaded.names <- load(fastr.functions.path)
+            log.message("Loaded names: ", loaded.names)
+        } else {
+            log.message("Warning: Running with GnuR but could not find file '", fastr.functions.path, "'")
+        }
+    }
 } else {
     log.message("Cannot use package cache since script directory cannot be determined")