Mercurial > hg > graal-jvmci-8
comparison mx.jvmci/mx_jvmci.py @ 22281:2333f2f5baed
Fixes for new jdkDeployedDists model in _unittest_config_participant
| author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
|---|---|
| date | Wed, 22 Jul 2015 16:42:10 +0200 |
| parents | ac5551e3ff9c |
| children | 9ab88ee1f79f |
comparison
equal
deleted
inserted
replaced
| 22280:ac5551e3ff9c | 22281:2333f2f5baed |
|---|---|
| 1083 # Remove entries from class path that are in JVMCI loaded jars | 1083 # Remove entries from class path that are in JVMCI loaded jars |
| 1084 cpIndex, cp = mx.find_classpath_arg(vmArgs) | 1084 cpIndex, cp = mx.find_classpath_arg(vmArgs) |
| 1085 if cp: | 1085 if cp: |
| 1086 excluded = set() | 1086 excluded = set() |
| 1087 for jdkDist in jdkDeployedDists: | 1087 for jdkDist in jdkDeployedDists: |
| 1088 dist = mx.distribution(jdkDist.name) | 1088 dist = jdkDist.dist() |
| 1089 excluded.update([d.output_dir() for d in dist.archived_deps() if d.isJavaProject()]) | 1089 excluded.update([d.output_dir() for d in dist.archived_deps() if d.isJavaProject()]) |
| 1090 cp = os.pathsep.join([e for e in cp.split(os.pathsep) if e not in excluded]) | 1090 cp = os.pathsep.join([e for e in cp.split(os.pathsep) if e not in excluded]) |
| 1091 vmArgs[cpIndex] = cp | 1091 vmArgs[cpIndex] = cp |
| 1092 | 1092 |
| 1093 # Run the VM in a mode where application/test classes can | 1093 # Run the VM in a mode where application/test classes can |