[GR-65697] [GR-65698] Fix ordering of arguments from cmdline and env variables

PullRequest: graalpython/3833

Author: otethal

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

@@ -167,9 +167,11 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S
             polyglotGet(launcherName, givenArgs);
         }
         ArrayList<String> unrecognized = new ArrayList<>();
-        List<String> defaultEnvironmentArgs = getDefaultEnvironmentArgs();
-        ArrayList<String> inputArgs = new ArrayList<>(givenArgs);
-        inputArgs.addAll(defaultEnvironmentArgs);
+        List<String> envVmArgs = getDefaultEnvironmentArgs("GRAAL_PYTHON_VM_ARGS");
+        List<String> envArgs = getDefaultEnvironmentArgs("GRAAL_PYTHON_ARGS");
+        ArrayList<String> inputArgs = new ArrayList<>(envVmArgs);
+        inputArgs.addAll(givenArgs);
+        inputArgs.addAll(envArgs);
         givenArguments = new ArrayList<>(inputArgs);
         List<String> arguments = new ArrayList<>(inputArgs);
         List<String> subprocessArgs = new ArrayList<>();
@@ -1133,7 +1135,7 @@ protected void printHelp(OptionCategory maxCategory) {
                         "   in the range [0,4294967295] to get hash values with a predictable seed.\n" +
                         "PYTHONPYCACHEPREFIX: if this is set, GraalPython will write .pyc files in a mirror\n" +
                         "   directory tree at this path, instead of in __pycache__ directories within the source tree.\n" +
-                        "GRAAL_PYTHON_ARGS: the value is added as arguments as if passed on the\n" +
+                        "GRAAL_PYTHON_ARGS: the value is added as arguments as if passed at the end of the\n" +
                         "   commandline. Arguments are split on whitespace - you can use \" and/or ' as required to\n" +
                         "   group them. Alternatively, if the value starts with a vertical tab character, the entire\n" +
                         "   value is split at vertical tabs and the elements are used as arguments without any further\n" +
@@ -1143,6 +1145,8 @@ protected void printHelp(OptionCategory maxCategory) {
                         "   with the current process id, and any $UUID$ is replaced with random unique string\n" +
                         "   that may contain letters, digits, and '-'. To pass a literal `$$', you must escape the\n" +
                         "   second `$' like so: `$\\$'\n" +
+                        "GRAAL_PYTHON_VM_ARGS: the value is prepended as arguments as if passed at the beginning\n" +
+                        "   of the commandline. See GRAAL_PYTHON_ARGS for details.\n" +
                         (wantsExperimental ? "\nArguments specific to the Graal Python launcher:\n" +
                                         "--show-version : print the Python version number and continue.\n" +
                                         "-CC            : run the C compiler used for generating GraalPython C extensions.\n" +
@@ -1462,15 +1466,15 @@ private static enum State {
         VTAB_DELIMITED,
     }
 
-    private static List<String> getDefaultEnvironmentArgs() {
+    private static List<String> getDefaultEnvironmentArgs(String envName) {
         String pid;
         if (isAOT()) {
             pid = String.valueOf(ProcessProperties.getProcessID());
         } else {
             pid = ManagementFactory.getRuntimeMXBean().getName().split("@")[0];
         }
         String uuid = UUID.randomUUID().toString();
-        String envArgsOpt = getEnv("GRAAL_PYTHON_ARGS");
+        String envArgsOpt = getEnv(envName);
         ArrayList<String> envArgs = new ArrayList<>();
         if (envArgsOpt != null) {
             State s = State.NORMAL;

graalpython/com.oracle.graal.python.test/src/tox/leftpad/tox.ini

@@ -12,4 +12,4 @@ basepython=graalpy
 setenv=
   PIP_INDEX_URL=https://ol-graal.oraclecorp.com/nexus-cache/repository/pypi-proxy/simple/
   PIP_TRUSTED_HOST=ol-graal.oraclecorp.com
-passenv = GRAALPY_LEFTPAD_FAIL,GRAAL_PYTHON_ARGS
+passenv = GRAALPY_LEFTPAD_FAIL,GRAAL_PYTHON_ARGS,GRAAL_PYTHON_VM_ARGS

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java

@@ -308,7 +308,7 @@ public void postInitialize(Python3Core core) {
         PDict environ = PFactory.createDict(language);
         String pyenvLauncherKey = "__PYVENV_LAUNCHER__";
         for (Entry<String, String> entry : getenv.entrySet()) {
-            if (entry.getKey().equals("GRAAL_PYTHON_ARGS") && entry.getValue().endsWith("\013")) {
+            if ((entry.getKey().equals("GRAAL_PYTHON_ARGS") || entry.getKey().equals("GRAAL_PYTHON_VM_ARGS")) && entry.getValue().endsWith("\013")) {
                 // was already processed at startup in GraalPythonMain and
                 // we don't want subprocesses to pick it up
                 continue;

mx.graalpython/mx_graalpython.py

@@ -2219,7 +2219,7 @@ def python_coverage(args):
                 *common_coverage_args,
                 f"--coverage.OutputFile={outfile}",
             ]
-            env['GRAAL_PYTHON_ARGS'] = " ".join(extra_args)
+            env['GRAAL_PYTHON_VM_ARGS'] = " ".join(extra_args)
             if kwds.pop("tagged", False):
                 run_tagged_unittests(executable, env=env, nonZeroIsFatal=False, **kwds) # pylint: disable=unexpected-keyword-arg;
             elif kwds.pop("hpy", False):

mx.graalpython/mx_graalpython_python_benchmarks.py

@@ -447,7 +447,7 @@ def _vmRun(self, vm, workdir, command, benchmarks, bmSuiteArgs):
                 join(vm_venv, "bin", "pyperformance"),
                 "run",
                 "--inherit-environ",
-                "PIP_INDEX_URL,PIP_EXTRA_INDEX_URL,PIP_TRUSTED_HOST,PIP_TIMEOUT,PIP_RETRIES,LD_LIBRARY_PATH,LIBRARY_PATH,CPATH,PATH,PYPY_GC_MAX,JAVA_OPTS,GRAAL_PYTHON_ARGS",
+                "PIP_INDEX_URL,PIP_EXTRA_INDEX_URL,PIP_TRUSTED_HOST,PIP_TIMEOUT,PIP_RETRIES,LD_LIBRARY_PATH,LIBRARY_PATH,CPATH,PATH,PYPY_GC_MAX,JAVA_OPTS,GRAAL_PYTHON_ARGS,GRAAL_PYTHON_VM_ARGS",
                 "-o",
                 json_file,
                 *bms,
@@ -465,7 +465,7 @@ def _vmRun(self, vm, workdir, command, benchmarks, bmSuiteArgs):
                 "--debug-single-value",
                 "--track-memory",
                 "--inherit-environ",
-                "PIP_INDEX_URL,PIP_EXTRA_INDEX_URL,PIP_TRUSTED_HOST,PIP_TIMEOUT,PIP_RETRIES,LD_LIBRARY_PATH,LIBRARY_PATH,CPATH,PATH,PYPY_GC_MAX,JAVA_OPTS,GRAAL_PYTHON_ARGS",
+                "PIP_INDEX_URL,PIP_EXTRA_INDEX_URL,PIP_TRUSTED_HOST,PIP_TIMEOUT,PIP_RETRIES,LD_LIBRARY_PATH,LIBRARY_PATH,CPATH,PATH,PYPY_GC_MAX,JAVA_OPTS,GRAAL_PYTHON_ARGS,GRAAL_PYTHON_VM_ARGS",
                 "-o",
                 json_file_memory,
                 *bms,