# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1346943107 -7200
# Node ID 0a0d0dfd83bc2c51c771c1c07727b25b5b13e395
# Parent  8886fdfde36cf6e4441798c9e4a103218c94a6a4
Gate : do not run tradesoap in fastdebug mode, do not run sunflow in product mode
Gate : Bootstrap with system assertions in fastdebug mode only, unittests in product mode only
Gate : do not tun DeoptALot

diff -r 8886fdfde36c -r 0a0d0dfd83bc mx/commands.py
--- a/mx/commands.py	Thu Sep 06 16:42:45 2012 +0200
+++ b/mx/commands.py	Thu Sep 06 16:51:47 2012 +0200
@@ -742,21 +742,22 @@
         else:
             _jacoco = 'off'
         
-        for vmbuild in ['fastdebug', 'product']:
-            _vmbuild = vmbuild
+
+        t = Task('BuildHotSpotGraal: fastdebug,product')
+        buildvms(['--vms', 'graal', '--builds', 'fastdebug,product'])
+        tasks.append(t.stop())
 
-            t = Task('BuildHotSpotGraal:' + vmbuild)
-            buildvms(['--vms', 'graal', '--builds', vmbuild])
-            tasks.append(t.stop())
-            
-            t = Task('BootstrapWithSystemAssertions:' + vmbuild)
-            vm(['-esa', '-version'])
-            tasks.append(t.stop())
+        _vmbuild = 'fastdebug'
+        t = Task('BootstrapWithSystemAssertions:fastdebug')
+        vm(['-esa', '-version'])
+        tasks.append(t.stop())
 
-            t = Task('UnitTests:' + vmbuild)
-            unittest(['@-XX:CompileCommand=exclude,*::run*'] if vmbuild == 'product'  else [])
-            tasks.append(t.stop())
+        _vmbuild = 'product'
+        t = Task('UnitTests:product')
+        unittest(['@-XX:CompileCommand=exclude,*::run*'])
+        tasks.append(t.stop())
 
+        for vmbuild in ['fastdebug', 'product']:
             for test in sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Gate, gateBuildLevel=vmbuild):
                 t = Task(str(test) + ':' + vmbuild)
                 if not test.test('graal'):
@@ -768,10 +769,6 @@
             
         _jacoco = 'off'
 
-        t = Task('BootstrapWithDeoptALot')
-        vm(['-XX:+DeoptimizeALot', '-XX:+VerifyOops', '-version'], vmbuild='fastdebug')
-        tasks.append(t.stop())
-
         t = Task('Checkstyle')
         if mx.checkstyle([]) != 0:
             t.abort('Checkstyle warnings were found')
diff -r 8886fdfde36c -r 0a0d0dfd83bc mx/sanitycheck.py
--- a/mx/sanitycheck.py	Thu Sep 06 16:42:45 2012 +0200
+++ b/mx/sanitycheck.py	Thu Sep 06 16:51:47 2012 +0200
@@ -71,10 +71,10 @@
     'luindex':    ['product', 'fastdebug', 'debug'],
     'lusearch':   ['product'],
     'pmd':        ['product', 'fastdebug', 'debug'],
-    'sunflow':    ['product', 'fastdebug', 'debug'],
+    'sunflow':    [           'fastdebug', 'debug'],
     'tomcat':     ['product', 'fastdebug', 'debug'],
     'tradebeans': ['product', 'fastdebug', 'debug'],
-    'tradesoap':  ['product', 'fastdebug'],
+    'tradesoap':  ['product'],
     'xalan':      ['product', 'fastdebug', 'debug'],
 }