[GR-15977] Add support of environment variables(os.environ) to os.exec

PullRequest: graalpython/529

Author: Franziska Geiger

graalpython/com.oracle.graal.python.test/src/tests/test_posix.py

@@ -38,13 +38,16 @@
 # SOFTWARE.
 
 import unittest
+import os
+import sys
+import posix
+import stat
 
 
 class PosixTests(unittest.TestCase):
 
     def test_uname(self):
         # just like cpython, a simple smoke test
-        import posix
         uname = posix.uname()
         self.assertRaises(TypeError, lambda: posix.uname(1))
         self.assertIsNotNone(uname.sysname)
@@ -56,28 +59,31 @@ def test_uname(self):
     def test_execv(self):
         # test creates a shell script, which again creates a file, to ensure script execution
         # Both files are deleted again in the end
-        import os
-        import sys
         new_file_path, cwd = self.create_file()
-        # os.execv(new_file_path, [new_file_path, 'the_input'])
         os.system("%s -c \"import os; os.execv('%s', ['%s', 'the_input'])\"" % (sys.executable, new_file_path, new_file_path))
         assert os.path.isfile(cwd + '/test.txt')
         self.delete_file(new_file_path, cwd)
 
     def test_execl(self):
         # test creates a shell script, which again creates a file, to ensure script execution
         # Both files are deleted again in the end
-        import os
-        import sys
         new_file_path, cwd = self.create_file()
-        # os.execl(new_file_path, [new_file_path, 'the_input'])
         os.system("%s -c \"import os; os.execl('%s', *['%s', 'the_input'])\"" % (sys.executable, new_file_path, new_file_path))
         assert os.path.isfile(cwd + '/test.txt')
         self.delete_file(new_file_path, cwd)
 
+    def test_execv_with_env(self):
+        new_file_path, cwd = self.create_file()
+        with open(new_file_path, 'w') as script:
+            script.write('#!/bin/sh\n')
+            script.write('echo $ENV_VAR > {}/test.txt\n'.format(cwd))
+        os.system("%s -c \"import os; os.environ['ENV_VAR']='the_text'; os.execv('%s', ['%s', 'the_input'])\"" % (sys.executable, new_file_path, new_file_path))
+        assert os.path.isfile(cwd + '/test.txt')
+        with open(cwd+'/test.txt', 'r') as result:
+            assert 'the_text' in result.readline()
+        self.delete_file(new_file_path, cwd)
+
     def create_file(self):
-        import os
-        import stat
         cwd = os.getcwd()
         new_file_path = os.path.join(cwd , 'myscript.sh')
         with open(new_file_path, 'w') as script:
@@ -90,6 +96,5 @@ def create_file(self):
         return new_file_path, cwd
 
     def delete_file(self, new_file_path, cwd):
-        import os
         os.remove(new_file_path)
         os.remove(cwd + '/test.txt')

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

@@ -100,6 +100,7 @@
 import com.oracle.graal.python.builtins.modules.PosixModuleBuiltinsFactory.ConvertPathlikeObjectNodeGen;
 import com.oracle.graal.python.builtins.modules.PosixModuleBuiltinsFactory.StatNodeFactory;
 import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.builtins.objects.bytes.BytesNodes;
 import com.oracle.graal.python.builtins.objects.bytes.BytesNodes.ToBytesNode;
 import com.oracle.graal.python.builtins.objects.bytes.PByteArray;
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
@@ -288,34 +289,36 @@ public void postInitialize(PythonCore core) {
         ((PDict) environAttr).setDictStorage(environ.getDictStorage());
     }
 
-    @Builtin(name = "execv", minNumOfPositionalArgs = 2)
+    @Builtin(name = "execv", minNumOfPositionalArgs = 3, declaresExplicitSelf = true)
     @GenerateNodeFactory
     public abstract static class ExecvNode extends PythonBuiltinNode {
 
+        @Child private BytesNodes.ToBytesNode toBytes = BytesNodes.ToBytesNode.create();
+
         @Specialization
-        Object execute(String path, PList args) {
-            return doExecute(path, args);
+        Object execute(PythonModule thisModule, String path, PList args) {
+            return doExecute(thisModule, path, args);
         }
 
         @Specialization
-        Object execute(PString path, PTuple args) {
-            return execute(path.getValue(), args);
+        Object execute(PythonModule thisModule, PString path, PTuple args) {
+            return execute(thisModule, path.getValue(), args);
         }
 
         @Specialization
-        Object execute(String path, PTuple args) {
+        Object execute(PythonModule thisModule, String path, PTuple args) {
             // in case of execl the PList happens to be in the tuples first entry
             Object list = GetItemDynamicNode.getUncached().execute(args.getSequenceStorage(), 0);
-            return doExecute(path, list instanceof PList ? (PList) list : args);
+            return doExecute(thisModule, path, list instanceof PList ? (PList) list : args);
         }
 
         @Specialization
-        Object execute(PString path, PList args) {
-            return doExecute(path.getValue(), args);
+        Object execute(PythonModule thisModule, PString path, PList args) {
+            return doExecute(thisModule, path.getValue(), args);
         }
 
         @TruffleBoundary
-        Object doExecute(String path, PSequence args) {
+        Object doExecute(PythonModule thisModule, String path, PSequence args) {
             try {
                 if (!getContext().isExecutableAccessAllowed()) {
                     throw raise(OSError, "executable access denied");
@@ -328,22 +331,32 @@ Object doExecute(String path, PSequence args) {
                 for (int i = 0; i < size; i++) {
                     cmd[i] = GetItemDynamicNode.getUncached().execute(args.getSequenceStorage(), i).toString();
                 }
-                Runtime rt = Runtime.getRuntime();
-                Process pr = rt.exec(cmd);
-                // retrieve output from executed script
+                PDict environ = (PDict) thisModule.getAttribute("environ");
+                ProcessBuilder builder = new ProcessBuilder(cmd);
+                Map<String, String> environment = builder.environment();
+                environ.entries().forEach(entry -> {
+                    environment.put(new String(toBytes.execute(null, entry.key)), new String(toBytes.execute(null, entry.value)));
+                });
+                Process pr = builder.start();
                 BufferedReader bfr = new BufferedReader(new InputStreamReader(pr.getInputStream()));
                 OutputStream stream = getContext().getEnv().out();
                 String line = "";
                 while ((line = bfr.readLine()) != null) {
                     stream.write(line.getBytes());
+                    stream.write("\n".getBytes());
+                }
+                BufferedReader stderr = new BufferedReader(new InputStreamReader(pr.getErrorStream()));
+                OutputStream errStream = getContext().getEnv().err();
+                line = "";
+                while ((line = stderr.readLine()) != null) {
+                    errStream.write(line.getBytes());
+                    errStream.write("\n".getBytes());
                 }
-
                 try {
                     pr.waitFor();
                 } catch (InterruptedException e) {
                     throw new IOException(e);
                 }
-
                 throw new PythonExitException(this, pr.exitValue());
             } catch (IOException e) {
                 throw raise(PythonErrorType.ValueError, "Could not execute script '%s'", e.getMessage());
@@ -362,7 +375,6 @@ String cwd() {
                 return "";
             }
         }
-
     }
 
     @Builtin(name = "chdir", minNumOfPositionalArgs = 1)