no longer run unittests under junit, instead run multi-context unittests as separate gate

timfel · timfel · commit b31fac5e2538 · 2019-09-25T08:35:43.000+02:00
diff --git a/ci.jsonnet b/ci.jsonnet
@@ -1 +1 @@
-{ overlay: "a65d4a3b3dc224b11cd07774cbb3c21084259daf" }
+{ overlay: "91be9b2632f293b113131237d17087c52276ac3e" }
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/python/PyTests.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/python/PyTests.java
diff --git a/mx.graalpython/mx_graalpython.py b/mx.graalpython/mx_graalpython.py
@@ -207,6 +207,7 @@ class GraalPythonTags(object):
     junit = 'python-junit'
     unittest = 'python-unittest'
     unittest_sandboxed = 'python-unittest-sandboxed'
+    unittest_multi = 'python-unittest-multi-context'
     unittest_jython = 'python-unittest-jython'
     tagged = 'python-tagged-unittest'
     svmunit = 'python-svm-unittest'
@@ -386,6 +387,10 @@ def graalpython_gate_runner(args, tasks):
         if task:
             run_python_unittests(python_gvm(["sandboxed"]), args=["--llvm.managed"])
 
+    with Task('GraalPython multi-context unittests', tasks, tags=[GraalPythonTags.unittest_multi]) as task:
+        if task:
+            run_python_unittests(python_gvm(), args=["-multi-context"])
+
     with Task('GraalPython Jython emulation tests', tasks, tags=[GraalPythonTags.unittest_jython]) as task:
         if task:
             run_python_unittests(python_gvm(), args=["--python.EmulateJython"], paths=["test_interop.py"])
diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py
@@ -44,15 +44,15 @@
             },
             {
                 "name": "sulong",
-                "version": "32e0341180c0b5157850fb6c385221cf54a41541",
+                "version": "4354931603c8c632ec0a168b0f1b808416230d89",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "32e0341180c0b5157850fb6c385221cf54a41541",
+                "version": "4354931603c8c632ec0a168b0f1b808416230d89",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ overlay: "a65d4a3b3dc224b11cd07774cbb3c21084259daf" }`
	`1`	`+{ overlay: "91be9b2632f293b113131237d17087c52276ac3e" }`
Original file line number	Diff line number	Diff line change
`@@ -44,15 +44,15 @@`
`44`	`44`	`},`
`45`	`45`	`{`
`46`	`46`	`"name": "sulong",`
`47`		`- "version": "32e0341180c0b5157850fb6c385221cf54a41541",`
	`47`	`+ "version": "4354931603c8c632ec0a168b0f1b808416230d89",`
`48`	`48`	`"subdir": True,`
`49`	`49`	`"urls": [`
`50`	`50`	`{"url": "https://github.com/oracle/graal", "kind": "git"},`
`51`	`51`	`]`
`52`	`52`	`},`
`53`	`53`	`{`
`54`	`54`	`"name": "regex",`
`55`		`- "version": "32e0341180c0b5157850fb6c385221cf54a41541",`
	`55`	`+ "version": "4354931603c8c632ec0a168b0f1b808416230d89",`
`56`	`56`	`"subdir": True,`
`57`	`57`	`"urls": [`
`58`	`58`	`{"url": "https://github.com/oracle/graal", "kind": "git"},`