[GR-61088] Make sure we run the TCK tests through the Truffle suite command.

PullRequest: graalpython/3641

Author: timfel

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "a2c662481228644c2e37d5adac1219bb2778eea1" }
+{ "overlay": "2c2a0d17556e07bfd9edcf91b9b6716d3966dc83" }

mx.graalpython/mx_graalpython.py

@@ -376,7 +376,7 @@ def _dev_pythonhome():
 
 def punittest(ars, report=False):
     """
-    Runs GraalPython junit tests, TCK, and memory leak tests, which can be skipped using --no-leak-tests.
+    Runs GraalPython junit tests and memory leak tests, which can be skipped using --no-leak-tests.
     Pass --regex to further filter the junit and TSK tests. GraalPy tests are always run in two configurations:
     with language home on filesystem and with language home served from the Truffle resources.
     """
@@ -407,9 +407,6 @@ def __str__(self):
     configs += [
         TestConfig("junit", vm_args + graalpy_tests + args, True),
         TestConfig("junit", vm_args + graalpy_tests + args, False),
-        # TCK suite is not compatible with the PythonMxUnittestConfig,
-        # so it must have its own run and the useResources config is ignored
-        TestConfig("tck", vm_args + ['com.oracle.truffle.tck.tests'] + args, False),
     ]
     if mx.is_linux():
         # see GR-60656 and GR-60658 for what's missing in darwin and windows support
@@ -1207,7 +1204,7 @@ def graalpython_gate_runner(args, tasks):
                         "--verbose",
                         "--no-leak-tests",
                         "--regex",
-                        r'((com\.oracle\.truffle\.tck\.tests)|(graal\.python\.test\.integration)|(graal\.python\.test\.(builtin|interop|util)))'
+                        r'((graal\.python\.test\.integration)|(graal\.python\.test\.(builtin|interop|util)))'
                     ],
                     report=True
                 )
@@ -1221,6 +1218,21 @@ def graalpython_gate_runner(args, tasks):
                     punittest(['--verbose', '--no-leak-tests', '--regex', 'com.oracle.graal.python.test.advanced.ExclusionsTest'])
                 finally:
                     jdk.java_args_pfx = prev
+            if report():
+                tmpfile = tempfile.NamedTemporaryFile(delete=False, suffix='.json.gz')
+                try:
+                    # Cannot use context manager because windows doesn't allow
+                    # make_test_report to read the file while it is open for
+                    # writing
+                    mx.command_function('tck')([f'--json-results={tmpfile.name}'])
+                    mx_gate.make_test_report(tmpfile.name, GraalPythonTags.junit + "-TCK")
+                finally:
+                    try:
+                        os.unlink(tmpfile.name)
+                    except:
+                        pass # Sometimes this fails on windows
+            else:
+                mx.command_function('tck')()
 
     # JUnit tests with Maven
     with Task('GraalPython integration JUnit with Maven', tasks, tags=[GraalPythonTags.junit_maven]) as task:

mx.graalpython/suite.py

@@ -45,31 +45,31 @@
             },
             {
                 "name": "sdk",
-                "version": "d7d4ddbefaac211de2fbfe6e4a8ee8bbdfc2affc",
+                "version": "999329767ba5537fd1595bc153b5dbe266f66062",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "tools",
-                "version": "d7d4ddbefaac211de2fbfe6e4a8ee8bbdfc2affc",
+                "version": "999329767ba5537fd1595bc153b5dbe266f66062",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "d7d4ddbefaac211de2fbfe6e4a8ee8bbdfc2affc",
+                "version": "999329767ba5537fd1595bc153b5dbe266f66062",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "d7d4ddbefaac211de2fbfe6e4a8ee8bbdfc2affc",
+                "version": "999329767ba5537fd1595bc153b5dbe266f66062",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},