# HG changeset patch # User Gilles Duboscq # Date 1364394683 -3600 # Node ID ca82d06ec93a021adf8040cd4b0f13189722e126 # Parent a33b6378cb76a6dc2107ebe8191ef0de4d02a60a mx: bench command should not run dacapos with -n 0 when using a specification such as scaladacapo:specs diff -r a33b6378cb76 -r ca82d06ec93a mx/commands.py --- a/mx/commands.py Mon Apr 08 11:20:19 2013 +0200 +++ b/mx/commands.py Wed Mar 27 15:31:23 2013 +0100 @@ -1065,7 +1065,9 @@ for dacapo in dacapos: if dacapo not in sanitycheck.dacapoSanityWarmup.keys(): mx.abort('Unknown DaCapo : ' + dacapo) - benchmarks += [sanitycheck.getDacapo(dacapo, sanitycheck.dacapoSanityWarmup[dacapo][sanitycheck.SanityCheckLevel.Benchmark])] + iterations = sanitycheck.dacapoSanityWarmup[dacapo][sanitycheck.SanityCheckLevel.Benchmark] + if (iterations > 0): + benchmarks += [sanitycheck.getDacapo(dacapo, iterations)] if ('scaladacapo' in args or 'all' in args): benchmarks += sanitycheck.getScalaDacapos(level=sanitycheck.SanityCheckLevel.Benchmark) @@ -1074,7 +1076,9 @@ for scaladacapo in scaladacapos: if scaladacapo not in sanitycheck.dacapoScalaSanityWarmup.keys(): mx.abort('Unknown Scala DaCapo : ' + scaladacapo) - benchmarks += [sanitycheck.getScalaDacapo(scaladacapo, sanitycheck.dacapoScalaSanityWarmup[scaladacapo][sanitycheck.SanityCheckLevel.Benchmark])] + iterations = sanitycheck.dacapoScalaSanityWarmup[scaladacapo][sanitycheck.SanityCheckLevel.Benchmark] + if (iterations > 0): + benchmarks += [sanitycheck.getScalaDacapo(scaladacapo, iterations)] #Bootstrap if ('bootstrap' in args or 'all' in args):