Mercurial > hg > truffle
changeset 4244:a69889e5a8a5
Made the DaCapo library be downloaded only on demand.
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Sat, 07 Jan 2012 23:59:54 +0100 |
| parents | 37cd9490f7f0 |
| children | b019b2ebe03e |
| files | mx/commands.py mx/sanitycheck.py |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mx/commands.py Sat Jan 07 23:59:23 2012 +0100 +++ b/mx/commands.py Sat Jan 07 23:59:54 2012 +0100 @@ -139,7 +139,7 @@ def dacapo(args): """run one or all DaCapo benchmarks - DaCapo options are distinguised from VM options by a '@' prefix. + DaCapo options are distinguished from VM options by a '@' prefix. For example, '@--iterations @5' will pass '--iterations 5' to the DaCapo harness."""
--- a/mx/sanitycheck.py Sat Jan 07 23:59:23 2012 +0100 +++ b/mx/sanitycheck.py Sat Jan 07 23:59:54 2012 +0100 @@ -102,7 +102,11 @@ def getDacapo(name, n, dacapoArgs=[]): dacapo = mx.get_env('DACAPO_CP') if dacapo is None: - dacapo = commands._graal_home + r'/lib/dacapo-9.12-bach.jar' + l = mx.library('DACAPO', False) + if l is not None: + dacapo = l.get_path(True) + else: + mx.abort('DaCapo 9.12 jar file must be specified with DACAPO_CP environment variable or as DACAPO library') if not isfile(dacapo) or not dacapo.endswith('.jar'): mx.abort('Specified DaCapo jar file does not exist or is not a jar file: ' + dacapo)