From 7b60982dfc07734b08b289fd8e28827f38b7f3b4 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Fri, 7 Oct 2016 12:07:29 -0700
Subject: [PATCH] ci.hocon: gate -> rgate
---
ci.hocon | 2 +-
mx.fastr/mx_fastr.py | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ci.hocon b/ci.hocon
index a349722376..57e9286e73 100644
--- a/ci.hocon
+++ b/ci.hocon
@@ -70,7 +70,7 @@ common : ${java8Downloads} ${packagesLinux} {
# the "mx" tool. This defines a common prefix for all gate commands. The "-t"
# arg indicates the exact set of gate "tasks" that will be run.
-gateCmd : ["mx", "--strict-compliance", "gate", "--strict-mode", "-t"]
+gateCmd : ["mx", "--strict-compliance", "rgate", "--strict-mode", "-t"]
# currently disabled gate commands: FindBugs,Checkheaders,Distribution Overlap Check,BuildJavaWithEcj
diff --git a/mx.fastr/mx_fastr.py b/mx.fastr/mx_fastr.py
index 7b61a3078a..b3e5006c3f 100644
--- a/mx.fastr/mx_fastr.py
+++ b/mx.fastr/mx_fastr.py
@@ -260,7 +260,15 @@ def _fastr_gate_runner(args, tasks):
mx_gate.add_gate_runner(_fastr_suite, _fastr_gate_runner)
def rgate(args):
- '''Run the R gate, with some standard tasks excluded as they currently fail'''
+ '''
+ Run 'mx.gate' with given args (used in CI system).
+ N.B. This will fail if run without certain exclusions; use the local
+ 'gate' command for that.
+ '''
+ mx_gate.gate(args)
+
+def gate(args):
+ '''Run 'mx.gate' with some standard tasks excluded as they currently fail'''
mx_gate.gate(args + ['-x', '-t', 'FindBugs,Checkheaders,Distribution Overlap Check,BuildJavaWithEcj'])
def _test_srcdir():
@@ -518,6 +526,7 @@ _commands = {
'Rscript' : [rscript, '[options]'],
'rtestgen' : [testgen, ''],
'rgate' : [rgate, ''],
+ 'gate' : [gate, ''],
'junit' : [junit, ['options']],
'junitsimple' : [junit_simple, ['options']],
'junitdefault' : [junit_default, ['options']],
--
GitLab