diff mx.graal/suite.py @ 22276:8f16ac5f8271

merge fixes; updated suite import versions
author Doug Simon <doug.simon@oracle.com>
date Tue, 21 Jul 2015 16:25:53 +0200
parents 329f734a9803
children a935eeae8ddf
line wrap: on
line diff
--- a/mx.graal/suite.py	Tue Jul 21 16:17:54 2015 +0200
+++ b/mx.graal/suite.py	Tue Jul 21 16:25:53 2015 +0200
@@ -6,14 +6,14 @@
     "suites": [
             {
                "name" : "jvmci",
-               "version" : "2ea24a36675cf5264577361bddbc2ee2517dd08d",
+               "version" : "706aa848a8d7128dcb5692964aefeaed99fd22f4",
                "urls" : [
                     {"url" : "https://lafo.ssw.uni-linz.ac.at/hg/graal-jvmci-8", "kind" : "hg"},
                 ]
             },
             {
                "name" : "truffle",
-               "version" : "6efd3e3389adfcc1f43e07be8f0aae2cb8cd5499",
+               "version" : "854e52a0869cd26ebd7d5556d98a347a55679b99",
                "urls" : [
                     {"url" : "https://lafo.ssw.uni-linz.ac.at/hg/truffle-mx2", "kind" : "hg"},
                     # Disable reference to snapshots until they are built from truffle-mx2 or truffle-mx2 is renamed to truffle
@@ -927,10 +927,6 @@
         "GRAAL_TRUFFLE",
         "truffle:TRUFFLE_SL",
       ],
-      "exclude" : [
-        "TRUFFLE",
-        "TRUFFLE_DSL_PROCESSOR",
-      ],
     },
 
     "GRAAL_NODEINFO_PROCESSOR" : {