# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1423221440 -3600
# Node ID 32c7a5a88523a07fb750bad3a8cc1393fb022e1d
# Parent  ce23018b970a48c386dd9c1736eab14ab5e209e5
Run unit tests even earlier during gate

diff -r ce23018b970a -r 32c7a5a88523 mx/mx_graal.py
--- a/mx/mx_graal.py	Fri Feb 06 12:11:22 2015 +0100
+++ b/mx/mx_graal.py	Fri Feb 06 12:17:20 2015 +0100
@@ -1481,17 +1481,24 @@
     vm(vmargs)
 
 def _basic_gate_body(args, tasks):
-    with Task('BuildHotSpotGraal: fastdebug,product', tasks):
-        buildvms(['--vms', 'graal,server', '--builds', 'fastdebug,product'])
+    # Build server-hosted-graal now so we can run the unit tests
+    with Task('BuildHotSpotGraalHosted: product', tasks):
+        buildvms(['--vms', 'server', '--builds', 'product'])
 
-    with VM('server', 'product'):  # hosted mode
+    # Run unit tests on server-hosted-graal
+    with VM('server', 'product'):
         with Task('UnitTests:hosted-product', tasks):
             unittest(['--enable-timing', '--verbose', '--fail-fast'])
 
-    with VM('server', 'product'):  # hosted mode
+    # Run baseline unit tests on server-hosted-graal
+    with VM('server', 'product'):
         with Task('UnitTests-BaselineCompiler:hosted-product', tasks):
             unittest(['--enable-timing', '--verbose', '--whitelist', 'test/whitelist_baseline.txt', '-G:+UseBaselineCompiler'])
 
+    # Build the other VM flavors
+    with Task('BuildHotSpotGraalOthers: fastdebug,product', tasks):
+        buildvms(['--vms', 'graal,server', '--builds', 'fastdebug,product'])
+
     with VM('graal', 'fastdebug'):
         with Task('BootstrapWithSystemAssertions:fastdebug', tasks):
             vm(['-esa', '-XX:-TieredCompilation', '-version'])