From e0d2af6e4a1a894431b6e1bd9347d60f9c317b7a Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Wed, 16 Nov 2016 15:24:22 -0800
Subject: [PATCH] mx.fastr: revert junit_* definitions to allow override

---
 mx.fastr/mx_fastr.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mx.fastr/mx_fastr.py b/mx.fastr/mx_fastr.py
index cb937d8620..a472b925bf 100644
--- a/mx.fastr/mx_fastr.py
+++ b/mx.fastr/mx_fastr.py
@@ -370,19 +370,19 @@ def junit(args):
     return mx_fastr_junit.junit(args, _junit_r_harness, parser=parser, jdk_default=get_default_jdk())
 
 def junit_simple(args):
-    return junit(['--tests', _simple_unit_tests()] + args)
+    return mx.command_function('junit')(['--tests', _simple_unit_tests()] + args)
 
 def junit_noapps(args):
-    return junit(['--tests', _gate_noapps_unit_tests()] + args)
+    return mx.command_function('junit')(['--tests', _gate_noapps_unit_tests()] + args)
 
 def junit_nopkgs(args):
-    return junit(['--tests', ','.join([_simple_unit_tests(), _nodes_unit_tests()])] + args)
+    return mx.command_function('junit')(['--tests', ','.join([_simple_unit_tests(), _nodes_unit_tests()])] + args)
 
 def junit_default(args):
-    return junit(['--tests', _all_unit_tests()] + args)
+    return mx.command_function('junit')(['--tests', _all_unit_tests()] + args)
 
 def junit_gate(args):
-    return junit(['--tests', _gate_unit_tests()] + args)
+    return mx.command_function('junit')(['--tests', _gate_unit_tests()] + args)
 
 def _test_package():
     return 'com.oracle.truffle.r.test'
-- 
GitLab