- Added execution output stream to java system out

- Added argument testing to unit test
- added execl support plus another unit test
- Added typeslot file as external dependency

Author: Franziska Geiger

graalpython/com.oracle.graal.python.cext/include/typeslots.h

@@ -1,3 +1,43 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
 /* Do not renumber the file; these numbers are part of the stable ABI. */
 /* Disabled, see #10181 */
 #undef Py_bf_getbuffer

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -56,6 +56,22 @@ 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
+        new_file_path, cwd = self.create_file()
+        os.execv(new_file_path, [new_file_path, 'the_input'])
+        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
+        new_file_path, cwd = self.create_file()
+        os.execl(new_file_path, [new_file_path, 'the_input'])
+        assert os.path.isfile(cwd + '/test.txt')
+        self.delete_file(new_file_path, cwd)
+
+    def create_file(self):
         import os
         import stat
         cwd = os.getcwd()
@@ -64,11 +80,12 @@ def test_execv(self):
             script.write('#!/bin/sh\n')
             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')
+        assert os.path.isfile(new_file_path)
         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, 'the_input'])
-        assert os.path.isfile(cwd + '/test.txt')
+        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

@@ -139,6 +139,7 @@
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.graal.python.runtime.exception.PythonExitException;
+import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.graal.python.runtime.sequence.storage.ByteSequenceStorage;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
@@ -295,13 +296,20 @@ Object execute(String path, PList args) {
             return doExecute(path, args);
         }
 
+        @Specialization
+        Object execute(PString path, PTuple args) {
+            // in case of execl the PList happens to be in the tuples first entry
+            Object list = args.getSequenceStorage().getItemNormalized(0);
+            return doExecute(path.getValue(), list instanceof PList ? (PList) list : args);
+        }
+
         @Specialization
         Object execute(PString path, PList args) {
             return doExecute(path.getValue(), args);
         }
 
         @TruffleBoundary
-        Object doExecute(String path, PList args) {
+        Object doExecute(String path, PSequence args) {
             try {
                 int size = args.getSequenceStorage().length();
                 String[] cmd = new String[size];
@@ -310,7 +318,7 @@ Object doExecute(String path, PList args) {
                 }
                 Runtime rt = Runtime.getRuntime();
                 Process pr = rt.exec(cmd);
-                // retrieve output from executed script and print it
+                // retrieve output from executed script
                 BufferedReader bfr = new BufferedReader(new InputStreamReader(pr.getInputStream()));
                 String line = "";
                 while ((line = bfr.readLine()) != null) {

graalpython/lib-graalpython/posix.py

@@ -143,3 +143,9 @@ def uname():
 @__builtin__
 def get_terminal_size(fd = None):
     return terminal_size(old_get_terminal_size(fd))
+
+def execl(file, *args):
+    """execl(file, *args)
+    Execute the executable file with argument list args, replacing the
+    current process. """
+    execv(file, args)