Merge

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/FastRTckTest.java

@@ -165,6 +165,45 @@ public class FastRTckTest extends TruffleTCK {
         return "valuesObject";
     }
 
+    @Override
+    public void readWriteBooleanValue() throws Exception {
+        // TODO not yet supported
+    }
+
+    @Override
+    public void readWriteDoubleValue() throws Exception {
+        // TODO not yet supported
+    }
+
+    @Override
+    public void readWriteCharValue() throws Exception {
+        // TODO not yet supported
+    }
+
+    @Override
+    public void readWriteShortValue() throws Exception {
+        // TODO not yet supported
+    }
+
+    @Override
+    public void readWriteByteValue() throws Exception {
+        // TODO not yet supported
+    }
+
+    @Override
+    public void readWriteIntValue() throws Exception {
+        // TODO not yet supported
+    }
+
+    @Override
+    public void readWriteFloatValue() throws Exception {
+        // TODO not yet supported
+    }
+
+    public void testAddComplexNumbersWithMethod() throws Exception {
+        // TODO not yet supported
+    }
+
     @Override
     @Test
     public void testNull() {
@@ -211,6 +250,21 @@ public class FastRTckTest extends TruffleTCK {
         // no floats in FastR
     }
 
+    @Override
+    public void testPlusWithOneNegativeShort() throws Exception {
+        // no floats in FastR
+    }
+
+    @Override
+    public void testPlusWithDoubleFloatSameAsInt() throws Exception {
+        // no floats in FastR
+    }
+
+    @Override
+    public void testPlusWithLongMaxIntMinInt() throws Exception {
+        // no longs in FastR
+    }
+
     @Override
     public void testPlusWithLong() throws Exception {
         // no longs in FastR

mx.fastr/mx_fastr.py

@@ -87,7 +87,7 @@ def do_run_r(args, command, extraVmArgs=None, jdk=None, nonZeroIsFatal=True):
     vmArgs = ['-cp', mx.classpath(_r_command_project)]
     # jvmci specific
     if _mx_jvmci:
-        vmArgs += ['-Dgraal.option.InliningDepthError=500', '-Dgraal.option.EscapeAnalysisIterations=3', '-XX:JVMCINMethodSizeLimit=1000000']
+        vmArgs += ['-Dgraal.InliningDepthError=500', '-Dgraal.EscapeAnalysisIterations=3', '-XX:JVMCINMethodSizeLimit=1000000']
 
     if extraVmArgs is None or not '-da' in extraVmArgs:
         # unless explicitly disabled we enable assertion checking
@@ -115,7 +115,7 @@ def _sanitize_vmArgs(jdk, vmArgs):
     i = 0
     while i < len(vmArgs):
         vmArg = vmArgs[i]
-        if 'graal.option' in vmArg or 'JVMCI' in vmArg:
+        if 'graal' in vmArg or 'JVMCI' in vmArg:
             if vm and vm == "original":
                 i = i + 1
                 continue
@@ -352,10 +352,10 @@ def _junit_r_harness(args, vmArgs, junitArgs):
     junitArgs += ['--runlistener', runlistener]
 
     # suppress Truffle compilation by using a high threshold
-    vmArgs += ['-Dgraal.option.TruffleCompilationThreshold=100000']
+    vmArgs += ['-Dgraal.TruffleCompilationThreshold=100000']
 
     if _mx_jvmci:
-        vmArgs += ['-Dgraal.option.InliningDepthError=500', '-Dgraal.option.EscapeAnalysisIterations=3', '-XX:JVMCINMethodSizeLimit=1000000', '-Xmx4G']
+        vmArgs += ['-Dgraal.InliningDepthError=500', '-Dgraal.EscapeAnalysisIterations=3', '-XX:JVMCINMethodSizeLimit=1000000', '-Xmx5G']
 
     setREnvironment()
     jdk = get_default_jdk()
@@ -541,8 +541,8 @@ def load_optional_suite(name, rev):
         mx.build_suite(opt_suite)
     return opt_suite
 
-_r_apptests_rev = 'dfa1747a3b230ed6d8af55e229ec339eb58d38ed'
-_r_benchmarks_rev = '72d53a9a99cf3ade1376e5c540a07e5095eb29f6'
+_r_apptests_rev = '804b75871abe803f46af6b2a075cc3f6acfdd6e9'
+_r_benchmarks_rev = '0b4f36819086323aebce7a2d7bc62949ff90950b'
 
 def mx_post_parse_cmd_line(opts):
     # load optional suites, r_apptests first so r_benchmarks can find it

mx.fastr/suite.py

@@ -27,7 +27,7 @@ suite = {
     "suites" : [
             {
                "name" : "graal",
-               "version" : "d2c1517a2487dc0c9803f141e79152fc75a4dbe6",
+               "version" : "f6b021195f0811495a1763d6259612d69db3d78f",
                "urls" : [
                     {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-compiler", "kind" : "hg"},
                     {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},