comparison mx/commands.py @ 8132:394f685c1502

prepend -XX:GraalClassPath option if graal.jar exists (GRAAL-136)
author Doug Simon <doug.simon@oracle.com>
date Wed, 06 Mar 2013 18:04:37 +0100
parents c7d7d9936809
children 6e3ebc6fd5a4
comparison
equal deleted inserted replaced
8131:83ec1df0a30f 8132:394f685c1502
654 'destfile' : 'jacoco.exec' 654 'destfile' : 'jacoco.exec'
655 } 655 }
656 args = ['-javaagent:' + jacocoagent.get_path(True) + '=' + ','.join([k + '=' + v for k, v in agentOptions.items()])] + args 656 args = ['-javaagent:' + jacocoagent.get_path(True) + '=' + ','.join([k + '=' + v for k, v in agentOptions.items()])] + args
657 if '-d64' not in args: 657 if '-d64' not in args:
658 args = ['-d64'] + args 658 args = ['-d64'] + args
659
660 graalJar = join(_graal_home, 'graal.jar')
661 if exists(graalJar):
662 args = ['-XX:GraalClassPath=' + graalJar] + args
659 exe = join(jdk, 'bin', mx.exe_suffix('java')) 663 exe = join(jdk, 'bin', mx.exe_suffix('java'))
660 dbg = _native_dbg.split() if _native_dbg is not None else [] 664 dbg = _native_dbg.split() if _native_dbg is not None else []
661 return mx.run(dbg + [exe, '-' + vm] + args, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd, timeout=timeout) 665 return mx.run(dbg + [exe, '-' + vm] + args, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd, timeout=timeout)
662 666
663 def _find_classes_with_annotations(p, pkgRoot, annotations, includeInnerClasses=False): 667 def _find_classes_with_annotations(p, pkgRoot, annotations, includeInnerClasses=False):