From 4b72486b2779df97d4fafd7a8cbafe3e33ed2827 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Sun, 10 Apr 2016 11:35:28 -0700
Subject: [PATCH] install.cran.packages: fix global assign typo
---
ci.hocon | 2 +-
com.oracle.truffle.r.test.cran/r/install.cran.packages.R | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/ci.hocon b/ci.hocon
index 0db109ae5a..132ffac1a2 100644
--- a/ci.hocon
+++ b/ci.hocon
@@ -66,7 +66,7 @@ pkginstall: ${common} ${java8Downloads} {
timelimit : "6:00:00"
run : [
["mx", "build"]
- ["mx", "pkgtest", "--invert-pkgset", "--print-ok-installs", "--install-dependents-first", "--pkg-count", "1000"]
+ ["mx", "pkgtest", "--invert-pkgset", "--ok-only", "--print-ok-installs", "--install-dependents-first", "--pkg-count", "1000"]
]
}
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 30eb7e07f3..f19ea0bfc8 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
@@ -655,8 +655,6 @@ parse.args <- function() {
run.tests <<- TRUE
} else if (a == "--testdir") {
testdir <<- get.argvalue()
- } else if (a == "--pkg-list-installed") {
- pkg.list.installed <<- T
} else if (a == "--print-ok-installs") {
print.ok.installs <<- T
} else if (a == "--list-versions") {
@@ -682,7 +680,7 @@ parse.args <- function() {
stop("--pkg.pattern and --pkg.filelist are mutually exclusive")
}
if (is.na(pkg.pattern) && is.na(pkg.filelistfile)) {
- pkg.pattern <- "^.*"
+ pkg.pattern <<- "^.*"
}
}
@@ -761,7 +759,6 @@ testdir <- "test"
pkg.pattern <- NA
pkg.filelist <- character()
pkg.filelistfile <- NA
-pkg.list.installed <- F
print.ok.installs <- F
use.installed.pkgs <- F
verbose <- F
--
GitLab