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 6f6ac20367fb943b12546ca5e3f58b01cbf8d7c8..a92c95ff4a23de6e5b9ec66b9e0a38d7e6d14ade 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 @@ -537,6 +537,15 @@ install.suggests <- function(pkgnames) { for (pkgname in pkgnames) { suggests <- install.order(avail.pkgs, avail.pkgs[pkgname, ], "suggests") if (length(suggests) > 0) { + if (is.fastr() && !ignore.blacklist) { + # no point in trying to install blacklisted packages (which are likely) + blacklist <- get.blacklist() + nsuggests <- suggests[!suggests %in% blacklist] + if (length(nsuggests) != length(suggests)) { + cat("not installing Suggests of:", pkgname, ", one or more is blacklisted", "\n") + return() + } + } dep.status <- install.status[suggests] # three cases: # 1. all TRUE: nothing to do all already installed ok diff --git a/mx.fastr/mx_fastr_pkgs.py b/mx.fastr/mx_fastr_pkgs.py index 25bb29517c7e5affbf052eb4790a71b5df0c4033..874dbf5e651d0f7df036a77780e047dc0dff5cec 100644 --- a/mx.fastr/mx_fastr_pkgs.py +++ b/mx.fastr/mx_fastr_pkgs.py @@ -235,11 +235,27 @@ def pkgtest(args): return rc def tar_tests(testdir): - test_tar = join(_fastr_suite_dir, testdir + '.tar') - subprocess.call(['tar', 'cf', test_tar, os.path.basename(testdir)]) - if os.path.exists(test_tar + '.gz'): - os.remove(test_tar + '.gz') - subprocess.call(['gzip', test_tar]) + if os.environ.has_key('FASTR_TEST_GZIP'): + test_tar = testdir + '.tar' + subprocess.call(['tar', 'cf', test_tar, os.path.basename(testdir)]) + if os.path.exists(test_tar + '.gz'): + os.remove(test_tar + '.gz') + subprocess.call(['gzip', test_tar]) + else: + # workaround for lack of support for accessing gz files + with open(testdir + '.agg', 'w') as o: + for root, _, files in os.walk(testdir): + for f in files: + ext = os.path.splitext(f)[1] + if f == 'test_time' or f == 'testfile_status' or ext == '.pdf' or ext == '.prev' or ext == '.save': + continue + absfile = join(root, f) + relfile = relpath(absfile, _fastr_suite_dir()) + o.write('#### ' + relfile + '\n') + with open(absfile) as inp: + text = inp.read() + o.write(text) + class TestFileStatus: '''