Mercurial > hg > graal-jvmci-8

changeset 22283:65eb572cbcb7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extended JVM_<vmbuild>_<vm> template distribution with MacOS support
author Doug Simon <doug.simon@oracle.com>
date Wed, 22 Jul 2015 20:39:26 +0200
parents 9ab88ee1f79f
children 09acb1bc3a56
files mx.jvmci/mx_jvmci.py mx.jvmci/suite.py
diffstat 2 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mx.jvmci/mx_jvmci.py	Wed Jul 22 17:14:47 2015 +0200
+++ b/mx.jvmci/mx_jvmci.py	Wed Jul 22 20:39:26 2015 +0200
@@ -745,6 +745,11 @@
 
 def _hotspotReplaceResultsVar(m):
     var = m.group(1)
+    if var == 'os':
+        mx_os = mx.get_os()
+        if mx_os == 'darwin':
+            return 'bsd'
+        return mx_os
     if var == 'nojvmci':
         if get_vm().endswith('nojvmci'):
             return '-nojvmci'
--- a/mx.jvmci/suite.py	Wed Jul 22 17:14:47 2015 +0200
+++ b/mx.jvmci/suite.py	Wed Jul 22 20:39:26 2015 +0200
@@ -300,7 +300,12 @@
           "amd64" : {
             "path" : "build/<vmbuild>/linux/amd64/<vm>/jvm.tar",
           }
-        }
+        },
+        "darwin" : {
+          "amd64" : {
+            "path" : "build/<vmbuild>/darwin/amd64/<vm>/jvm.tar",
+          }
+        },
       }
     },