diff mx/commands.py @ 4230:b780ecb920c9

Add SPECjvm2008 to benchmarks, use dacapos defined in sanitycheck for the gate
author Gilles Duboscq <gilles.m.duboscq@gmail.com>
date Thu, 05 Jan 2012 20:15:45 +0100
parents e872562f95f8
children 057620486c90
line wrap: on
line diff
--- a/mx/commands.py	Thu Jan 05 17:25:28 2012 +0100
+++ b/mx/commands.py	Thu Jan 05 20:15:45 2012 +0100
@@ -179,7 +179,6 @@
     vmOpts = [arg for arg in args if not arg.startswith('@')]
     
     failed = []
-    print str(numTests)
     for (test, n) in numTests.items():
         if not sanitycheck.getDacapo(test, n, dacapoArgs).test('-graal', opts=vmOpts):
             failed.append(test)
@@ -566,11 +565,9 @@
     
     # 8. Run selected DaCapo benchmarks
     mx.log(time.strftime('%d %b %Y %H:%M:%S - Running DaCapo benchmarks...'))
-    dacapo(['eclipse'])
-    #dacapo(['tradesoap'])
-    dacapo(['batik'])
-    dacapo(['avrora'])
-    dacapo(['fop'])
+    for test in sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Gate):
+        if not test.test('-graal'):
+            mx.abort(test.group + ' ' + test.name + ' Failed')
 
     duration = datetime.timedelta(seconds=time.time() - start)
     mx.log(time.strftime('%d %b %Y %H:%M:%S - Gate done (duration - ' + str(duration) + ')'))
@@ -581,6 +578,8 @@
     benchmarks = sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Benchmark)
     #Bootstrap
     benchmarks += sanitycheck.getBootstraps()
+    #SPECjvm2008
+    benchmarks += [sanitycheck.getSPECjvm2008(True, 60, 120)]
     
     for test in benchmarks:
         if not results.has_key(test.group):