From 2cf803a799cd44811cfedb64033dd7a0b60646eb Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Fri, 12 Feb 2016 10:20:37 -0800
Subject: [PATCH] gate: enable checkstyle, checkoverlap; remove redundant
overrides of pylint/eclipseformat
---
mx.fastr/mx_fastr.py | 11 +----------
mx.fastr/suite.py | 1 +
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/mx.fastr/mx_fastr.py b/mx.fastr/mx_fastr.py
index 75b81ec0ea..441777bbc8 100644
--- a/mx.fastr/mx_fastr.py
+++ b/mx.fastr/mx_fastr.py
@@ -221,13 +221,6 @@ def build(args):
os.environ['LFLAGS'] = '-Xlinker -lstdc++'
return mx_jvm().build(args)
-def pylint(args):
- return mx.pylint(['--primary'])
-
-def eclipseformat(args):
- mx.log("Note: eclipseformat is currently not supported for FastR")
- return 0
-
def _fastr_gate_runner(args, tasks):
# Until fixed, we call Checkstyle here and limit to primary
with mx_gate.Task('Checkstyle check', tasks) as t:
@@ -266,7 +259,7 @@ mx_gate.add_gate_runner(_fastr_suite, _fastr_gate_runner)
def gate(args):
'''Run the R gate'''
# exclude findbugs until compliant
- mx_gate.gate(args + ['-x', '-t', 'FindBugs,Checkheaders,Checkstyle,Distribution Overlap Check,BuildJavaWithEcj'])
+ mx_gate.gate(args + ['-x', '-t', 'FindBugs,Checkheaders,Distribution Overlap Check,BuildJavaWithEcj'])
def _test_harness_body_install_new(args, vmArgs):
'''the callback from mx.test'''
@@ -568,14 +561,12 @@ _commands = {
'junitsimple' : [junit_simple, ['options']],
'junitdefault' : [junit_default, ['options']],
'junitgate' : [junit_gate, ['options']],
- 'pylint' : [pylint, ['options']],
'unittest' : [unittest, ['options']],
'rbcheck' : [rbcheck, ['options']],
'rcmplib' : [rcmplib, ['options']],
'test' : [test, ['options']],
'rrepl' : [rrepl, '[options]'],
'installcran' : [installcran, '[options]'],
- 'eclipseformat' : [eclipseformat, '[options]'],
}
_commands.update(mx_fastr_pkgtest._commands)
diff --git a/mx.fastr/suite.py b/mx.fastr/suite.py
index 017d2cfbac..2e264e27d2 100644
--- a/mx.fastr/suite.py
+++ b/mx.fastr/suite.py
@@ -406,6 +406,7 @@ suite = {
"distDependencies" : [
"truffle:TRUFFLE_API",
"truffle:TRUFFLE_DEBUG",
+ "TRUFFLE_R_PARSER_PROCESSOR",
],
},
--
GitLab