From 5b8c342c0937c70a4d698523a071d56a13be053a Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Wed, 12 Aug 2015 20:43:36 -0700
Subject: [PATCH] update graal import/mx version
---
mx.fastr/mx_fastr.py | 4 ++--
mx.fastr/suite.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/mx.fastr/mx_fastr.py b/mx.fastr/mx_fastr.py
index 15e033ce3c..67ae1eb180 100644
--- a/mx.fastr/mx_fastr.py
+++ b/mx.fastr/mx_fastr.py
@@ -157,8 +157,8 @@ def _test_harness_body(args, vmArgs):
print "placeholder for mx test"
def test(args):
- vm = mx_graal.VM('server' if mx_graal._vm is None else mx_graal._vm)
- with vm:
+ vm = _get_graal_vm()
+ with mx_jvmci.VM(vm):
mx.test(args, harness=_test_harness_body)
def _test_srcdir():
diff --git a/mx.fastr/suite.py b/mx.fastr/suite.py
index 3f060b89d4..c31aea79bd 100644
--- a/mx.fastr/suite.py
+++ b/mx.fastr/suite.py
@@ -21,14 +21,14 @@
# questions.
#
suite = {
- "mxversion" : "5.2.1",
+ "mxversion" : "5.4.1",
"name" : "fastr",
"imports" : {
"suites" : [
{
"name" : "graal",
- "version" : "4369b936c52001d16254ded0211134f3020ba78c",
+ "version" : "21baeafdf6a53ff96fedc6d98c2db398f3d92d0a",
"urls" : [{"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-compiler", "kind" : "hg"}]
},
],
--
GitLab