[GR-5233] Fixes for package testing.

PullRequest: fastr/1168

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RRuntime.java

@@ -48,7 +48,7 @@ public class RRuntime {
     //@formatter:off
     // Parts of the welcome message originate from GNU R.
     public static final String WELCOME_MESSAGE =
-        "FastR version " + RVersionNumber.FULL + "\n" +
+        "R version " + RVersionNumber.FULL + " (FastR)\n" +
         "Copyright (c) 2013-17, Oracle and/or its affiliates\n" +
         "Copyright (c) 1995-2016, The R Core Team\n" +
         "Copyright (c) 2016 The R Foundation for Statistical Computing\n" +

com.oracle.truffle.r.test.packages/r/install.packages.R

@@ -810,7 +810,7 @@ system.test <- function(pkgname) {
 	# we want to stop tests that hang, but some packages have many tests
 	# each of which spawns a sub-process (over which we have no control)
 	# so we time out the entire set after 20 minutes.
-	rc <- system2(rscript, args, env="FASTR_PROCESS_TIMEOUT=20")
+	rc <- system2(rscript, args, env=c("FASTR_PROCESS_TIMEOUT=20", paste0("R_LIBS_USER=",shQuote(lib.install)),"R_LIBS="))
 	rc
 }