Don't remove relaunch args from orig_argv

Author: msimacek

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

@@ -762,14 +762,6 @@ protected void launch(Builder contextBuilder) {
             }
         }
 
-        if (relaunchArgs != null) {
-            Iterator<String> it = origArgs.iterator();
-            while (it.hasNext()) {
-                if (relaunchArgs.contains(it.next())) {
-                    it.remove();
-                }
-            }
-        }
         origArgs.add(0, toAbsolutePath(executable));
         contextBuilder.option("python.OrigArgv", String.join(STRING_LIST_DELIMITER, origArgs));
 

graalpython/lib-python/3/test/test_sys.py

@@ -1200,7 +1200,8 @@ def test_orig_argv(self):
         code = textwrap.dedent('''
             import sys
             print(sys.argv)
-            print(sys.orig_argv)
+            # GraalPy change: remove options implicitly passed down by our posix module magic
+            print([arg for arg in sys.orig_argv if not arg.startswith(('--experimental-options', '--vm.', '--python.'))])
         ''')
         args = [sys.executable, '-I', '-X', 'utf8', '-c', code, 'arg']
         proc = subprocess.run(args, check=True, capture_output=True, text=True, env=env)