Mercurial > hg > truffle
changeset 5234:c1e5e3ab546d
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 12 Apr 2012 15:58:05 +0200 |
parents | efbb1e33e2f3 (current diff) ce6cb3a1eb44 (diff) |
children | 15c857decc43 |
files | mx/commands.py |
diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mx/commands.py Thu Apr 12 15:55:03 2012 +0200 +++ b/mx/commands.py Thu Apr 12 15:58:05 2012 +0200 @@ -185,7 +185,6 @@ DaCapo harness.""" numTests = {} - if len(args) > 0: level = getattr(sanitycheck.SanityCheckLevel, args[0], None) if level is not None: @@ -218,10 +217,11 @@ # The remainder are VM options vmOpts = [arg for arg in args if not arg.startswith('@')] + vm = _vm failed = [] for (test, n) in numTests.items(): - if not sanitycheck.getDacapo(test, n, dacapoArgs).test('graal', opts=vmOpts): + if not sanitycheck.getDacapo(test, n, dacapoArgs).test(vm, opts=vmOpts): failed.append(test) if len(failed) != 0: @@ -280,10 +280,11 @@ # The remainder are VM options vmOpts = [arg for arg in args if not arg.startswith('@')] + vm = _vm; failed = [] for (test, n) in numTests.items(): - if not sanitycheck.getScalaDacapo(test, n, dacapoArgs).test('graal', opts=vmOpts): + if not sanitycheck.getScalaDacapo(test, n, dacapoArgs).test(vm, opts=vmOpts): failed.append(test) if len(failed) != 0: @@ -895,7 +896,8 @@ mx.abort('-it (Iteration time) needs a numeric value (seconds)') vmArgs.remove('-it') benchArgs.remove(args[itIdx+1]) - sanitycheck.getSPECjvm2008(benchArgs, skipValid, wt, it).bench('graal', opts=vmArgs) + vm = _vm; + sanitycheck.getSPECjvm2008(benchArgs, skipValid, wt, it).bench(vm, opts=vmArgs) def hsdis(args): """install the hsdis library