Mercurial > hg > graal-compiler
changeset 16394:0dd27c6472d7
mx: remove entries from unittest class path that are in graal.jar when running with a Graal enabled VM
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 03 Jul 2014 14:31:34 +0200 |
parents | 380290b81eb0 |
children | ad431bf0de07 |
files | mx/mx_graal.py |
diffstat | 1 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mx/mx_graal.py Thu Jul 03 14:29:21 2014 +0200 +++ b/mx/mx_graal.py Thu Jul 03 14:31:34 2014 +0200 @@ -1050,12 +1050,20 @@ prefixArgs.append('-XX:-DisableExplicitGC') with open(testfile) as fp: testclasses = [l.rstrip() for l in fp.readlines()] + + # Remove entries from class path that are in graal.jar + cp = prefixCp + coreCp + os.pathsep + projectsCp + if isGraalEnabled(_get_vm()): + graalDist = mx.distribution('GRAAL') + graalJarCp = set([d.output_dir() for d in graalDist.sorted_deps()]) + cp = os.pathsep.join([e for e in cp.split(os.pathsep) if e not in graalJarCp]) + if len(testclasses) == 1: # Execute Junit directly when one test is being run. This simplifies # replaying the VM execution in a native debugger (e.g., gdb). - vm(prefixArgs + vmArgs + ['-cp', prefixCp + coreCp + ':' + projectsCp, 'com.oracle.graal.test.GraalJUnitCore'] + coreArgs + testclasses) + vm(prefixArgs + vmArgs + ['-cp', cp, 'com.oracle.graal.test.GraalJUnitCore'] + coreArgs + testclasses) else: - vm(prefixArgs + vmArgs + ['-cp', prefixCp + coreCp + ':' + projectsCp + os.pathsep + mxdir, name] + [testfile] + coreArgs) + vm(prefixArgs + vmArgs + ['-cp', cp + os.pathsep + mxdir, name] + [testfile] + coreArgs) try: _run_tests(args, harness, annotations, testfile, whitelist, regex)