# HG changeset patch
# User Roland Schatz <roland.schatz@oracle.com>
# Date 1437997934 -7200
# Node ID 1199fd261ff26e10b7dd50338142a827f22b6b82
# Parent  07d0349fd18a81e701be1dbe982135c4912f4983
Move bootstrap from jvmci gate to graal gate.

diff -r 07d0349fd18a -r 1199fd261ff2 mx.graal/mx_graal.py
--- a/mx.graal/mx_graal.py	Mon Jul 27 12:15:30 2015 +0200
+++ b/mx.graal/mx_graal.py	Mon Jul 27 13:52:14 2015 +0200
@@ -220,7 +220,26 @@
         with Task('CTW:hosted-product', tasks) as t:
             if t: ctw(['--ctwopts', '-Inline +ExitVMOnException', '-esa', '-G:+CompileTheWorldMultiThreaded', '-G:-InlineDuringParsing', '-G:-CompileTheWorldVerbose'])
 
-    # Build the other VM flavors
+    with VM('jvmci', 'fastdebug'):
+        with Task('BootstrapWithSystemAssertions:fastdebug', tasks) as t:
+            if t: vm(['-esa', '-XX:-TieredCompilation', '-version'])
+
+    with VM('jvmci', 'fastdebug'):
+        with Task('BootstrapWithSystemAssertionsNoCoop:fastdebug', tasks) as t:
+            if t: vm(['-esa', '-XX:-TieredCompilation', '-XX:-UseCompressedOops', '-version'])
+
+    with VM('jvmci', 'product'):
+        with Task('BootstrapWithGCVerification:product', tasks) as t:
+            if t:
+                out = mx.DuplicateSuppressingStream(['VerifyAfterGC:', 'VerifyBeforeGC:']).write
+                vm(['-XX:-TieredCompilation', '-XX:+UnlockDiagnosticVMOptions', '-XX:+VerifyBeforeGC', '-XX:+VerifyAfterGC', '-version'], out=out)
+
+    with VM('jvmci', 'product'):
+        with Task('BootstrapWithG1GCVerification:product', tasks) as t:
+            if t:
+                out = mx.DuplicateSuppressingStream(['VerifyAfterGC:', 'VerifyBeforeGC:']).write
+                vm(['-XX:-TieredCompilation', '-XX:+UnlockDiagnosticVMOptions', '-XX:-UseSerialGC', '-XX:+UseG1GC', '-XX:+VerifyBeforeGC', '-XX:+VerifyAfterGC', '-version'], out=out)
+
     with VM('jvmci', 'fastdebug'):
         with Task('BootstrapEconomyWithSystemAssertions:fastdebug', tasks) as t:
             if t: vm(['-esa', '-XX:-TieredCompilation', '-G:CompilerConfiguration=economy', '-version'])
diff -r 07d0349fd18a -r 1199fd261ff2 mx.graal/suite.py
--- a/mx.graal/suite.py	Mon Jul 27 12:15:30 2015 +0200
+++ b/mx.graal/suite.py	Mon Jul 27 13:52:14 2015 +0200
@@ -6,7 +6,7 @@
     "suites": [
             {
                "name" : "jvmci",
-               "version" : "2c352e8d76ecd626a83cfb0960328e16226f1475",
+               "version" : "c9eefaa577f61ad1899def78cf3f9755ad96436a",
                "urls" : [
                     {"url" : "https://lafo.ssw.uni-linz.ac.at/hg/graal-jvmci-8", "kind" : "hg"},
                     {"url" : "http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots", "kind" : "binary"},