Merge pull request #300 in G/fastr from ~MICK.JORDAN_ORACLE.COM/fastr:feature/svm to master

* commit 'b00cecff':
  fix some missing files in FASTR_NATIVE_DEV dist; add FASTR_UNIT_TESTS dist

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

@@ -34,7 +34,7 @@ public abstract class ResourceHandlerFactory {
     public interface Handler {
         /**
          * See {@link java.lang.Class#getResource(String)}.
-         * 
+         *
          * @return The path component of the {@link java.net URL} returned by
          *         {@link java.lang.Class#getResource(String)}
          */
@@ -58,7 +58,7 @@ public abstract class ResourceHandlerFactory {
 
     private static ResourceHandlerFactory theInstance;
 
-    private static ResourceHandlerFactory getInstance() {
+    public static ResourceHandlerFactory getInstance() {
         return theInstance;
     }
 

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestBase.java

@@ -234,6 +234,12 @@ public class TestBase {
         }
     }
 
+    @SuppressWarnings("unchecked")
+    public <T> T doBeforeTest() {
+        beforeTest();
+        return (T) this;
+    }
+
     private static class ExpectedTestOutputManager extends TestOutputManager {
         private final boolean generate;
 

mx.fastr/mx_fastr_dists.py

@@ -54,12 +54,26 @@ class DelFastRNativeProject(FastRProjectAdapter):
     def getBuildTask(self, args):
         return mx.NativeBuildTask(args, self)
 
+    def _get_gnur_files(self, gnur_dir, files, results):
+        for f in files:
+            results.append(join(self.dir, gnur_dir, f))
+
     def getResults(self):
+        '''
+        Capture all the files from the com.oracle.truffle.r.native project that are needed
+        in an alternative implementation of the R FFI. This includes some files from GNU R.
+        This code has to be kept in sync with the FFI implementation.
+        '''
+        # plain files
+        results = [join(self.dir, "platform.mk")]
         gnur = join('gnur', mx_fastr.r_version())
         gnur_appl = join(gnur, 'src', 'appl')
-        # plain files
-        results = [join(self.dir, result) for result in ["platform.mk", join(gnur_appl, 'pretty.c'), join(gnur_appl, 'interv.c')]]
-
+        self._get_gnur_files(gnur_appl, ['pretty.c', 'interv.c'], results)
+        gnur_main = join(gnur, 'src', 'main')
+        self._get_gnur_files(gnur_main, ['colors.c', 'devices.c', 'engine.c', 'format.c', 'graphics.c',
+                                         'plot.c', 'plot3d.c', 'plotmath.c', 'rlocale.c', 'sort.c'], results)
+        # these files are not compiled, just "included"
+        self._get_gnur_files(gnur_main, ['xspline.c', 'rlocale_data.h'], results)
         # directories
         for d in ["fficall/src/common", "fficall/src/include", "fficall/src/variable_defs"]:
             self._get_files(d, results)

mx.fastr/suite.py

@@ -434,6 +434,20 @@ suite = {
       ],
     },
 
+    "FASTR_UNIT_TESTS" : {
+      "description" : "unit tests",
+      "dependencies" : ["com.oracle.truffle.r.test"],
+      "exclude": ["mx:HAMCREST", "mx:JUNIT", "mx:JMH"],
+      "distDependencies" : [
+        "FASTR",
+        "truffle:TRUFFLE_API",
+        "truffle:TRUFFLE_DEBUG",
+        "TRUFFLE_R_PARSER_PROCESSOR",
+        "truffle:TRUFFLE_TCK",
+      ],
+
+    },
+
     "FASTR_NATIVE_DEV": {
         "description" : "support for overriding the native project implementation in a separate suite",
         "dependencies" : ["com.oracle.truffle.r.native"],