comparison mx/mx_graal.py @ 16417:9fe3cb463079

mx: classpath function now accepts distributions as well (which are prepend to the class path)
author Doug Simon <doug.simon@oracle.com>
date Mon, 07 Jul 2014 14:51:53 +0200
parents ad431bf0de07
children 7520833c6e7f
comparison
equal deleted inserted replaced
16416:4fe215bc2da5 16417:9fe3cb463079
1897 mx.run_java(['-jar', jacocoreport.get_path(True), '--in', 'jacoco.exec', '--out', out] + [p.dir for p in mx.projects()]) 1897 mx.run_java(['-jar', jacocoreport.get_path(True), '--in', 'jacoco.exec', '--out', out] + [p.dir for p in mx.projects()])
1898 1898
1899 def sl(args): 1899 def sl(args):
1900 """run an SL program""" 1900 """run an SL program"""
1901 vmArgs, slArgs = _extract_VM_args(args) 1901 vmArgs, slArgs = _extract_VM_args(args)
1902 vm(vmArgs + ['-cp', mx.classpath("com.oracle.truffle.sl"), "com.oracle.truffle.sl.SLMain"] + slArgs) 1902 vm(vmArgs + ['-cp', mx.classpath(["TRUFFLE", "com.oracle.truffle.sl"]), "com.oracle.truffle.sl.SLMain"] + slArgs)
1903 1903
1904 def isGraalEnabled(vm): 1904 def isGraalEnabled(vm):
1905 return vm != 'original' and not vm.endswith('nograal') 1905 return vm != 'original' and not vm.endswith('nograal')
1906 1906
1907 def jol(args): 1907 def jol(args):
2073 findbugsResults = join(_graal_home, 'findbugs.results') 2073 findbugsResults = join(_graal_home, 'findbugs.results')
2074 2074
2075 cmd = ['-jar', findbugsJar, '-textui', '-low', '-maxRank', '15'] 2075 cmd = ['-jar', findbugsJar, '-textui', '-low', '-maxRank', '15']
2076 if sys.stdout.isatty(): 2076 if sys.stdout.isatty():
2077 cmd.append('-progress') 2077 cmd.append('-progress')
2078 cmd = cmd + ['-auxclasspath', mx.classpath([p.name for p in nonTestProjects]), '-output', findbugsResults, '-exitcode'] + args + outputDirs 2078 cmd = cmd + ['-auxclasspath', mx.classpath(['GRAAL'] + [p.name for p in nonTestProjects]), '-output', findbugsResults, '-exitcode'] + args + outputDirs
2079 exitcode = mx.run_java(cmd, nonZeroIsFatal=False) 2079 exitcode = mx.run_java(cmd, nonZeroIsFatal=False)
2080 if exitcode != 0: 2080 if exitcode != 0:
2081 with open(findbugsResults) as fp: 2081 with open(findbugsResults) as fp:
2082 mx.log(fp.read()) 2082 mx.log(fp.read())
2083 os.unlink(findbugsResults) 2083 os.unlink(findbugsResults)