# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1334151480 -7200
# Node ID ce6cb3a1eb44982609785122837205d6033de637
# Parent  e0f17fb3e7d24bf37ec8820a701b8c8d265ef74b
mx dacapo, mx scaladacapo and mx specjvm2008 should use the specified vm

diff -r e0f17fb3e7d2 -r ce6cb3a1eb44 mx/commands.py
--- a/mx/commands.py	Wed Apr 11 11:37:24 2012 +0200
+++ b/mx/commands.py	Wed Apr 11 15:38:00 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:
@@ -889,7 +890,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