diff --git a/ci.hocon b/ci.hocon index 0db109ae5a2d491e7e17657dc62f5cd9cdad6bed..132ffac1a247a22f4b769891a5b976ccdcda52e9 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 30eb7e07f3e3f159d0b7e9feb9225b634f4dd82d..f19ea0bfc8ac395a4d1f6f07b1fea43384a033e7 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