- Added execution output stream to java system out

- Added argument testing to unit test

Author: Franziska Geiger

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

@@ -54,22 +54,21 @@ def test_uname(self):
         self.assertIsNotNone(uname.machine)
 
     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 stat
         cwd = os.getcwd()
         new_file_path = os.path.join(cwd , 'myscript.sh')
-
         with open(new_file_path, 'w') as script:
             script.write('#!/bin/sh\n')
-            script.write("echo \"something echo\" > {}/test.txt".format(cwd))
+            script.write("echo \"something echo with\" $1 > {}/test.txt\n".format(cwd))
+            script.write('echo this is an output\n')
         assert os.path.isfile(cwd + '/myscript.sh')
-
         st = os.stat(new_file_path)
         os.chmod(new_file_path, st.st_mode | stat.S_IEXEC)
-
-        os.execv(new_file_path, [new_file_path, 'Something'])
+        os.execv(new_file_path, [new_file_path, 'the_input'])
         assert os.path.isfile(cwd + '/test.txt')
-
         os.remove(new_file_path)
         os.remove(cwd + '/test.txt')
 

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

@@ -49,8 +49,10 @@
 import static com.oracle.truffle.api.TruffleFile.UNIX_PERMISSIONS;
 import static com.oracle.truffle.api.TruffleFile.UNIX_UID;
 
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.lang.ProcessBuilder.Redirect;
@@ -303,11 +305,17 @@ Object doExecute(String path, PList args) {
             try {
                 int size = args.getSequenceStorage().length();
                 String[] cmd = new String[size];
-                cmd[0] = path;
-                for (int i = 1; i < size; i++) {
+                for (int i = 0; i < size; i++) {
                     cmd[i] = args.getSequenceStorage().getItemNormalized(i).toString();
                 }
-                new ProcessBuilder(cmd).start();
+                Runtime rt = Runtime.getRuntime();
+                Process pr = rt.exec(cmd);
+                // retrieve output from executed script and print it
+                BufferedReader bfr = new BufferedReader(new InputStreamReader(pr.getInputStream()));
+                String line = "";
+                while ((line = bfr.readLine()) != null) {
+                    System.out.println(line);
+                }
             } catch (IOException e) {
                 throw raise(PythonErrorType.ValueError, "Could not execute script '%s'", e.getMessage());
             }