Fix coverage launcher to work with hpy tests

Author: msimacek

mx.graalpython/downstream_tests.py

@@ -76,18 +76,6 @@ def downstream_test_hpy(graalpy, testdir=None, args=None, env=None, check=True,
     hpy_test_root = hpy_root / "test"
     venv = testdir / 'hpy_venv'
     run([graalpy, "-m", "venv", str(venv)])
-    if graalpy.endswith('.sh'):
-        # Workaround jacoco launcher creating broken venv
-        venv_launcher_path = venv / "bin" / "graalpy.sh"
-        launcher = venv_launcher_path.read_text()
-        venv_launcher_path.unlink()
-        launcher = launcher.replace(
-            '--python.Executable=',
-            f'--python.Executable={venv_launcher_path.absolute()} --python.BaseExecutable=',
-        )
-        venv_launcher_path.write_text(launcher)
-        venv_launcher_path.chmod(0o755)
-        run([str(venv_launcher_path), '-m', 'ensurepip', '--default-pip'])
     run_in_venv(venv, ["pip", "install", "pytest", "pytest-xdist", "pytest-rerunfailures!=16.0", "filelock"])
     env = env or os.environ.copy()
     env["SETUPTOOLS_SCM_PRETEND_VERSION"] = "0.9.0"

mx.graalpython/mx_graalpython.py

@@ -1019,7 +1019,6 @@ def graalvm_vm_arg(java_arg):
         if sys.platform != 'win32':
             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 arg in agent_args_list:
@@ -1033,9 +1032,8 @@ def graalvm_vm_arg(java_arg):
                     int main(int argc, char **argv) {{
                         char *new_args[argc + 3 + {len(agent_args_list)}];
                         int arg_index = 0;
-                        new_args[arg_index++] = "{original_launcher}";
+                        new_args[arg_index++] = argv[0];
                         new_args[arg_index++] = "--jvm";
-                        new_args[arg_index++] = "{exe_arg}";
                         {extra_args_c}
                         for (int i = 1; i < argc; i++) {{
                             new_args[arg_index++] = argv[i];