diff mx/commands.py @ 4312:8dd27e218e19

Merge
author Lukas Stadler <lukas.stadler@jku.at>
date Thu, 19 Jan 2012 19:06:25 +0100
parents 600cbdce9805
children b0aa4a52b89c 4aacce9c9cb9
line wrap: on
line diff
--- a/mx/commands.py	Thu Jan 19 18:53:48 2012 +0100
+++ b/mx/commands.py	Thu Jan 19 19:06:25 2012 +0100
@@ -361,7 +361,7 @@
             env.setdefault('ARCH_DATA_MODEL', '64')
             env.setdefault('LANG', 'C')
             env.setdefault('HOTSPOT_BUILD_JOBS', '3')
-            env.setdefault('ALT_BOOTDIR', jdk)
+            env['ALT_BOOTDIR'] = jdk
             env.setdefault('INSTALL', 'y')
             mx.run([mx.gmake_cmd(), build + 'graal'], cwd=join(_graal_home, 'make'), err=filterXusage)
     
@@ -516,8 +516,8 @@
         index = args.index('-resultfile')
         if index + 1 < len(args):
             resultFile = args[index + 1]
-	    del args[index]
-	    del args[index]
+            del args[index]
+            del args[index]
         else:
             mx.abort('-resultfile must be followed by a file name')
     vm = 'graal'
@@ -526,7 +526,7 @@
         if index + 1 < len(args):
             vm = args[index + 1]
             del args[index]
-	    del args[index]
+            del args[index]
         else:
             mx.abort('-vm must be followed by a vm name (graal, server, client..)')
     if len(args) is 0:
@@ -542,7 +542,7 @@
         benchmarks += sanitycheck.getBootstraps()
     #SPECjvm2008
     if ('specjvm2008' in args or 'all' in args):
-        benchmarks += [sanitycheck.getSPECjvm2008(True, 60, 120)]
+        benchmarks += [sanitycheck.getSPECjvm2008(True, 120, 120)]
     
     for test in benchmarks:
         if not results.has_key(test.group):