Mercurial > hg > truffle

comparison mx/mx_graal.py @ 18799:750db34c9fe1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
client-nograal is supported on Mac
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Thu, 08 Jan 2015 10:20:07 -0800
parents d7ec30ebb0f2
children 209c60cf3ea2
comparison
equal deleted inserted replaced
18798:f1e7e4f6d833 18799:750db34c9fe1
98 JDK_UNIX_PERMISSIONS_DIR = 0755 98 JDK_UNIX_PERMISSIONS_DIR = 0755
99 JDK_UNIX_PERMISSIONS_FILE = 0644 99 JDK_UNIX_PERMISSIONS_FILE = 0644
100 JDK_UNIX_PERMISSIONS_EXEC = 0755 100 JDK_UNIX_PERMISSIONS_EXEC = 0755
101 101
102 def isVMSupported(vm): 102 def isVMSupported(vm):
103 if 'client' in vm and len(platform.mac_ver()[0]) != 0: 103 if 'client' == vm and len(platform.mac_ver()[0]) != 0:
104 # Client VM not supported: java launcher on Mac OS X translates '-client' to '-server' 104 # Client VM not supported: java launcher on Mac OS X translates '-client' to '-server'
105 return False 105 return False
106 return True 106 return True
107 107
108 def _get_vm(): 108 def _get_vm():
1922 if '-h' in args: 1922 if '-h' in args:
1923 mx.help_(['jmh']) 1923 mx.help_(['jmh'])
1924 mx.abort(1) 1924 mx.abort(1)
1925 1925
1926 vmArgs, benchmarksAndJsons = _extract_VM_args(args) 1926 vmArgs, benchmarksAndJsons = _extract_VM_args(args)
1927 if '-XX:-UseGraalClassLoader' not in vmArgs: 1927 if isGraalEnabled(_get_vm()) and '-XX:-UseGraalClassLoader' not in vmArgs:
1928 vmArgs = ['-XX:-UseGraalClassLoader'] + vmArgs 1928 vmArgs = ['-XX:-UseGraalClassLoader'] + vmArgs
1929 1929
1930 benchmarks = [b for b in benchmarksAndJsons if not b.startswith('{')] 1930 benchmarks = [b for b in benchmarksAndJsons if not b.startswith('{')]
1931 jmhArgJsons = [b for b in benchmarksAndJsons if b.startswith('{')] 1931 jmhArgJsons = [b for b in benchmarksAndJsons if b.startswith('{')]
1932 jmhOutDir = join(_graal_home, 'mx', 'jmh') 1932 jmhOutDir = join(_graal_home, 'mx', 'jmh')