[GR-21590] Update imports.

PullRequest: graalpython/4030

Author: timfel

ci/graal/common.json

@@ -4,7 +4,7 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "7.62.0",
+  "mx_version": "7.62.2",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {

docs/site/03-compatibility.md

@@ -66,7 +66,7 @@ img.pylogo {
 <script>
     DB.ANY_VERSION = "any";
     DB.INSTALLS_BUT_FAILS_TESTS = "The package installs, but the test suite was not set up for GraalPy.";
-    DB.FAILS_TO_INSTALL = "The package fails to build or install.";
+    DB.FAILS_TO_INSTALL = "We have been unable to build, install, or run tests for this package.";
     DB.UNSUPPORTED = "The package is unsupported.";
     DB.PERCENT_PASSING = (pct) => `${pct}% of the tests are passing on GraalPy.`;
     const PATCH_AVAILABLE = "GraalPy will automatically apply a patch when installing this package to improve compatibility.";

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_contextlib.txt

@@ -18,7 +18,7 @@ test.test_contextlib.ContextManagerTestCase.test_contextmanager_trap_yield_after
 test.test_contextlib.ContextManagerTestCase.test_contextmanager_wrap_runtimeerror @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_contextlib.ContextManagerTestCase.test_instance_docstring_given_cm_docstring @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_contextlib.ContextManagerTestCase.test_keywords @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
-test.test_contextlib.ContextManagerTestCase.test_nokeepref @ darwin-arm64,win32-AMD64
+test.test_contextlib.ContextManagerTestCase.test_nokeepref @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_contextlib.ContextManagerTestCase.test_param_errors @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_contextlib.ContextManagerTestCase.test_recursive @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_contextlib.FileContextTestCase.testWithOpen @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_cprofile.txt

@@ -1,7 +1,7 @@
 test.test_cprofile.CProfileTest.test_output_file_when_changing_directory @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 # transient: inconsistent running time [GR-67706]
 !test.test_cprofile.CProfileTest.test_run_profile_as_module @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
-test.test_cprofile.CProfileTest.test_throw @ darwin-arm64,darwin-x86_64,linux-x86_64,win32-AMD64
+test.test_cprofile.CProfileTest.test_throw @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_cprofile.TestCommandLine.test_sort @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_profile.ProfileTest.test_calling_conventions @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_profile.ProfileTest.test_cprofile @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

mx.graalpython/mx_graalpython.py

@@ -1014,24 +1014,50 @@ def graalvm_vm_arg(java_arg):
         agent_args = ' '.join(graalvm_vm_arg(arg) for arg in mx_gate.get_jacoco_agent_args() or [])
 
         # We need to make sure the arguments get passed to subprocesses, so we create a temporary launcher
-        # with the arguments. We also disable compilation, it hardly helps for this use case
+        # with the arguments.
         original_launcher = os.path.abspath(os.path.realpath(launcher))
         if sys.platform != 'win32':
-            coverage_launcher = original_launcher + '.sh'
-            preamble = '#!/bin/sh'
-            pass_args = '"$@"'
+            coverage_launcher = original_launcher + "_cov"
+            c_launcher_source = coverage_launcher + ".c"
+            exe_arg = f"--python.Executable={coverage_launcher}"
+            agent_args_list = shlex.split(agent_args)
+            extra_args_c = []
+            for i, arg in enumerate(agent_args_list):
+                extra_args_c.append(f'new_args[{i + 3}] = "' + arg.replace("\"", r"\"") + '";')
+            extra_args_c = ' '.join(extra_args_c)
+            c_code = dedent(f"""\
+                    #include <stdio.h>
+                    #include <stdlib.h>
+                    #include <unistd.h>
+
+                    int main(int argc, char **argv) {{
+                        char *new_args[argc + 3 + {len(agent_args_list)}];
+                        new_args[0] = "{original_launcher}";
+                        new_args[1] = "--jvm";
+                        new_args[2] = "{exe_arg}";
+                        {extra_args_c}
+                        for (int i = 1; i < argc; i++) {{
+                            new_args[i + 3 + {len(agent_args_list)}] = argv[i];
+                        }}
+                        new_args[argc + 3 + {len(agent_args_list)}] = NULL;
+                        execvp("{original_launcher}", new_args);
+                        perror("execvp failed");
+                        return 1;
+                    }}
+            """)
+            with open(c_launcher_source, "w") as f:
+                f.write(c_code)
+            compile_cmd = ["cc", c_launcher_source, "-o", coverage_launcher]
+            subprocess.check_call(compile_cmd)
+            os.chmod(coverage_launcher, 0o775)
         else:
             coverage_launcher = original_launcher.replace('.exe', '.cmd')
             # Windows looks for libraries on PATH, we need to add the jvm bin dir there or it won't find the instrumentation dlls
             jvm_bindir = os.path.join(os.path.dirname(os.path.dirname(original_launcher)), 'jvm', 'bin')
-            preamble = f'@echo off\nset PATH=%PATH%;{jvm_bindir}'
-            pass_args = '%*'
-        with open(coverage_launcher, "w") as f:
-            f.write(f'{preamble}\n')
-            exe_arg = quote(f"--python.Executable={coverage_launcher}")
-            f.write(f'{original_launcher} --jvm {exe_arg} {agent_args} {pass_args}\n')
-        if sys.platform != 'win32':
-            os.chmod(coverage_launcher, 0o775)
+            with open(coverage_launcher, "w") as f:
+                f.write(f'@echo off\nset PATH=%PATH%;{jvm_bindir}\n')
+                exe_arg = quote(f"--python.Executable={coverage_launcher}")
+                f.write(f'{original_launcher} --jvm {exe_arg} {agent_args} %*\n')
         mx.log(f"Replaced {launcher} with {coverage_launcher} to collect coverage")
         launcher = coverage_launcher
     return launcher

mx.graalpython/suite.py

@@ -53,15 +53,15 @@
             },
             {
                 "name": "tools",
-                "version": "b1181d14631c6760fd72c5eb441ad1aeca1f937f",
+                "version": "b862bbf602252edc38d61ab86191a2fb5cfacd76",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "regex",
-                "version": "b1181d14631c6760fd72c5eb441ad1aeca1f937f",
+                "version": "b862bbf602252edc38d61ab86191a2fb5cfacd76",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},