From 10fff98b64d6a13b8885c62c9e94d84fe3740fc0 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Thu, 6 Oct 2016 20:10:41 -0700
Subject: [PATCH] pkgtest: get location of Rscript correct for subprocess when
R.home is not cwd
---
com.oracle.truffle.r.test.cran/r/install.cran.packages.R | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/com.oracle.truffle.r.test.cran/r/install.cran.packages.R b/com.oracle.truffle.r.test.cran/r/install.cran.packages.R
index 4c3f8f1105..8cf210cda4 100644
--- a/com.oracle.truffle.r.test.cran/r/install.cran.packages.R
+++ b/com.oracle.truffle.r.test.cran/r/install.cran.packages.R
@@ -611,7 +611,7 @@ install.pkg <- function(pkgname) {
system.install <- function(pkgname) {
script <- normalizePath("com.oracle.truffle.r.test.cran/r/install.package.R")
if (is.fastr()) {
- rscript = normalizePath("bin/Rscript")
+ rscript = file.path(R.home(), "bin", "Rscript")
} else {
rscript = "Rscript"
}
@@ -655,7 +655,7 @@ is.fastr <- function() {
system.test <- function(pkgname) {
script <- normalizePath("com.oracle.truffle.r.test.cran/r/test.package.R")
if (is.fastr()) {
- rscript = normalizePath("bin/Rscript")
+ rscript = file.path(R.home(), "bin", "Rscript")
} else {
rscript = "Rscript"
}
--
GitLab