Merge pull request #418 in G/fastr from ~LUKAS.STADLER_ORACLE.COM/fastr:nospecial_tests to master

* commit 'ac3f71f8':
  move "UnitTests: ExpectedTestOutput file check" from normal to style check gate run
  separate apps unit tests
  make test selection in ci.hocon more specific
  update .gitignore

.gitignore

@@ -10,6 +10,7 @@
 /mx.fastr/eclipse-config.zip
 /mx.fastr/netbeans-config.zip
 /mxbuild/
+/com.oracle.truffle.r.release/include/*
 /com.oracle.truffle.r.native/fficall/src/common/copy_appl_objects
 /com.oracle.truffle.r.native/fficall/lib/copy_appl_objects
 /com.oracle.truffle.r.native/builtinlibs/lib/*
@@ -127,3 +128,4 @@ test_fastr
 lib.install.cran*
 package.blacklist
 com.oracle.truffle.r.test.native/embedded/lib
+bench-results.json

ci.hocon

@@ -79,7 +79,7 @@ gateCmd : ["mx", "--strict-compliance", "rgate", "--strict-mode", "-t"]
 
 gateTestCommon : ${common} {
   run : [
-    ${gateCmd} ["Versions,JDKReleaseInfo,BuildJavaWithJavac,UnitTests: ExpectedTestOutput file check,UnitTests"]
+    ${gateCmd} ["Versions,JDKReleaseInfo,BuildJavaWithJavac,UnitTests: with specials"]
   ]
 }
 
@@ -118,7 +118,7 @@ gateStyle : ${common} {
     ECLIPSE_EXE : "$ECLIPSE/eclipse"
   }
   run : [
-    ${gateCmd} ["Versions,JDKReleaseInfo,Pylint,Canonicalization Check,BuildJavaWithJavac,IDEConfigCheck,CodeFormatCheck,Checkstyle,Copyright check"]
+    ${gateCmd} ["Versions,JDKReleaseInfo,Pylint,Canonicalization Check,BuildJavaWithJavac,IDEConfigCheck,CodeFormatCheck,Checkstyle,Copyright check, UnitTests: ExpectedTestOutput file check"]
   ]
 }
 

mx.fastr/mx_fastr.py

@@ -257,9 +257,14 @@ def _fastr_gate_runner(args, tasks):
             if junit(['--J', '@-DR:-UseSpecials', '--tests', _gate_noapps_unit_tests()]) != 0:
                 t.abort('unit tests failed')
 
-    with mx_gate.Task('UnitTests', tasks) as t:
+    with mx_gate.Task('UnitTests: with specials', tasks) as t:
         if t:
-            if junit(['--tests', _gate_unit_tests()]) != 0:
+            if junit(['--tests', _gate_noapps_unit_tests()]) != 0:
+                t.abort('unit tests failed')
+
+    with mx_gate.Task('UnitTests: apps', tasks) as t:
+        if t:
+            if junit(['--tests', _apps_unit_tests()]) != 0:
                 t.abort('unit tests failed')
 
 mx_gate.add_gate_runner(_fastr_suite, _fastr_gate_runner)