test install pakages OS indepdence fixes

com.oracle.truffle.r.native/run/R.sh

@@ -33,14 +33,17 @@ source="${BASH_SOURCE[0]}"
 while [ -h "$source" ] ; do source="$(readlink "$source")"; done
 PRIMARY_PATH="$( cd -P "$( dirname "$source" )" && pwd )"/../..
 
-mx=`which mx`
-if [ -z "$mx"] ; then
+which mx >/dev/null 2>&1
+whichrc=$?
+if [ $whichrc == 1 ] ; then
     if [ -z "$MX_HOME" ] ; then
-	echo "Error: mx cannot be found: add to PATH or set MX_HOME"
-	exit 1
+	    echo "Error: mx cannot be found: add to PATH or set MX_HOME"
+	    exit 1
     else
-	mx=$MX_HOME/mx
+	    mx=$MX_HOME/mx
     fi
+else
+    mx=`which mx`
 fi
 
 exec $mx $MX_R_GLOBAL_ARGS R $MX_R_CMD_ARGS "$@"

com.oracle.truffle.r.native/run/Rscript_exec.sh

@@ -29,14 +29,17 @@ source="${BASH_SOURCE[0]}"
 while [ -h "$source" ] ; do source="$(readlink "$source")"; done
 PRIMARY_PATH="$( cd -P "$( dirname "$source" )" && pwd )"/../..
 
-mx=`which mx`
-if [ -z "$mx"] ; then
+which mx >/dev/null 2>&1
+whichrc=$?
+if [ $whichrc == 1 ] ; then
     if [ -z "$MX_HOME" ] ; then
-	echo "Error: mx cannot be found: add to PATH or set MX_HOME"
-	exit 1
+	    echo "Error: mx cannot be found: add to PATH or set MX_HOME"
+	    exit 1
     else
-	mx=$MX_HOME/mx
+	    mx=$MX_HOME/mx
     fi
+else
+    mx=`which mx`
 fi
 
 exec $mx $MX_R_GLOBAL_ARGS Rscript $MX_R_CMD_ARGS "$@"

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/rpackages/TestRPackages.java

@@ -85,7 +85,7 @@ public class TestRPackages extends TestBase {
             Map<String, String> env = pb.environment();
             env.put("R_LIBS_USER", rpackagesLibs.toString());
             if (!generatingExpected()) {
-                env.put("R_INSTALL_TAR", "/usr/bin/tar");
+                env.put("R_INSTALL_TAR", REnvVars.get("TAR"));
             }
             try {
                 if (FastROptions.debugMatches("TestRPackages")) {