Skip to content
Snippets Groups Projects
Commit 10fff98b authored by Mick Jordan's avatar Mick Jordan
Browse files

pkgtest: get location of Rscript correct for subprocess when R.home is not cwd

parent 6bdf6eb1
Branches
No related tags found
No related merge requests found
...@@ -611,7 +611,7 @@ install.pkg <- function(pkgname) { ...@@ -611,7 +611,7 @@ install.pkg <- function(pkgname) {
system.install <- function(pkgname) { system.install <- function(pkgname) {
script <- normalizePath("com.oracle.truffle.r.test.cran/r/install.package.R") script <- normalizePath("com.oracle.truffle.r.test.cran/r/install.package.R")
if (is.fastr()) { if (is.fastr()) {
rscript = normalizePath("bin/Rscript") rscript = file.path(R.home(), "bin", "Rscript")
} else { } else {
rscript = "Rscript" rscript = "Rscript"
} }
...@@ -655,7 +655,7 @@ is.fastr <- function() { ...@@ -655,7 +655,7 @@ is.fastr <- function() {
system.test <- function(pkgname) { system.test <- function(pkgname) {
script <- normalizePath("com.oracle.truffle.r.test.cran/r/test.package.R") script <- normalizePath("com.oracle.truffle.r.test.cran/r/test.package.R")
if (is.fastr()) { if (is.fastr()) {
rscript = normalizePath("bin/Rscript") rscript = file.path(R.home(), "bin", "Rscript")
} else { } else {
rscript = "Rscript" rscript = "Rscript"
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment