[GR-22136] [GR-22252] Fix Python coverage reporting

PullRequest: graalpython/873

Author: timfel

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

@@ -88,7 +88,8 @@ public static void main(String[] args) {
     @Override
     protected List<String> preprocessArguments(List<String> givenArgs, Map<String, String> polyglotOptions) {
         ArrayList<String> unrecognized = new ArrayList<>();
-        ArrayList<String> inputArgs = new ArrayList<>();
+        List<String> defaultEnvironmentArgs = getDefaultEnvironmentArgs();
+        ArrayList<String> inputArgs = new ArrayList<>(defaultEnvironmentArgs);
         inputArgs.addAll(givenArgs);
         givenArguments = new ArrayList<>(inputArgs);
         List<String> arguments = new ArrayList<>(inputArgs);
@@ -308,10 +309,19 @@ private String[] getExecutableList() {
             ArrayList<String> exec_list = new ArrayList<>();
             sb.append(System.getProperty("java.home")).append(File.separator).append("bin").append(File.separator).append("java");
             exec_list.add(sb.toString());
+            String javaOptions = System.getenv("_JAVA_OPTIONS");
+            String javaToolOptions = System.getenv("JAVA_TOOL_OPTIONS");
             for (String arg : ManagementFactory.getRuntimeMXBean().getInputArguments()) {
                 if (arg.matches("-Xrunjdwp:transport=dt_socket,server=y,address=\\d+,suspend=y")) {
                     arg = arg.replace("suspend=y", "suspend=n");
                 }
+                if ((javaOptions != null && javaOptions.contains(arg)) || (javaToolOptions != null && javaToolOptions.contains(arg))) {
+                    // both _JAVA_OPTIONS and JAVA_TOOL_OPTIONS are adeed during
+                    // JVM startup automatically. We do not want to repeat these
+                    // for subprocesses, because they should also pick up those
+                    // variables.
+                    continue;
+                }
                 exec_list.add(arg);
             }
             exec_list.add("-classpath");
@@ -576,6 +586,10 @@ protected void printHelp(OptionCategory maxCategory) {
                         "   as specifying the -R option: a random value is used to seed the hashes of\n" +
                         "   str, bytes and datetime objects.  It can also be set to an integer\n" +
                         "   in the range [0,4294967295] to get hash values with a predictable seed.\n" +
+                        "GRAAL_PYTHON_ARGS: the value is added as arguments as if passed on the\n" +
+                        "   commandline. There is one special case: any `$$' in the value is replaced\n" +
+                        "   with the current process id. To pass a literal `$$', you must escape the\n" +
+                        "   second `$' like so: `$\\$'\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" +
@@ -808,6 +822,72 @@ private static final class ExitException extends RuntimeException {
         }
     }
 
+    private static enum State {
+        NORMAL,
+        SINGLE_QUOTE,
+        DOUBLE_QUOTE,
+        ESCAPE_SINGLE_QUOTE,
+        ESCAPE_DOUBLE_QUOTE,
+    }
+
+    private static List<String> getDefaultEnvironmentArgs() {
+        String pid;
+        if (isAOT()) {
+            pid = String.valueOf(ProcessProperties.getProcessID());
+        } else {
+            pid = ManagementFactory.getRuntimeMXBean().getName().split("@")[0];
+        }
+        String envArgsOpt = System.getenv("GRAAL_PYTHON_ARGS");
+        ArrayList<String> envArgs = new ArrayList<>();
+        State s = State.NORMAL;
+        StringBuilder sb = new StringBuilder();
+        if (envArgsOpt != null) {
+            for (char x : envArgsOpt.toCharArray()) {
+                if (s == State.NORMAL && Character.isWhitespace(x)) {
+                    addArgument(pid, envArgs, sb);
+                } else {
+                    if (x == '"') {
+                        if (s == State.NORMAL) {
+                            s = State.DOUBLE_QUOTE;
+                        } else if (s == State.DOUBLE_QUOTE) {
+                            s = State.NORMAL;
+                        } else if (s == State.ESCAPE_DOUBLE_QUOTE) {
+                            s = State.DOUBLE_QUOTE;
+                            sb.append(x);
+                        }
+                    } else if (x == '\'') {
+                        if (s == State.NORMAL) {
+                            s = State.SINGLE_QUOTE;
+                        } else if (s == State.SINGLE_QUOTE) {
+                            s = State.NORMAL;
+                        } else if (s == State.ESCAPE_SINGLE_QUOTE) {
+                            s = State.SINGLE_QUOTE;
+                            sb.append(x);
+                        }
+                    } else if (x == '\\') {
+                        if (s == State.SINGLE_QUOTE) {
+                            s = State.ESCAPE_SINGLE_QUOTE;
+                        } else if (s == State.DOUBLE_QUOTE) {
+                            s = State.ESCAPE_DOUBLE_QUOTE;
+                        }
+                    } else {
+                        sb.append(x);
+                    }
+                }
+            }
+            addArgument(pid, envArgs, sb);
+        }
+        return envArgs;
+    }
+
+    private static void addArgument(String pid, ArrayList<String> envArgs, StringBuilder sb) {
+        if (sb.length() > 0) {
+            String arg = sb.toString().replace("$$", pid).replace("\\$", "$");
+            envArgs.add(arg);
+            sb.setLength(0);
+        }
+    }
+
     private static boolean doEcho(@SuppressWarnings("unused") Context context) {
         return true;
     }

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2020, 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
@@ -44,14 +44,15 @@ def prints_like_iter(obj):
     assert s.startswith("<class '")
     assert s.endswith("iterator'>")
 
-def test_iter():
+def test_iter_printing_bytes():
     bytes_iterator = type(iter(b''))
     prints_like_iter(bytes_iterator)
     # <class 'bytes_iterator'>
 
     # bytearray_iterator = type(iter(bytearray()))
     # print(bytearray_iterator)
 
+def test_iter_printing_dict():
     dict_iterator = type(iter({}))
     prints_like_iter(dict_iterator)
     # <class 'dict_keyiterator'>
@@ -68,13 +69,15 @@ def test_iter():
     prints_like_iter(dict_itemiterator)
     # <class 'dict_itemiterator'>
 
+def test_iter_printing_list():
     list_iterator = type(iter([]))
     prints_like_iter(list_iterator)
     # <class 'list_iterator'>
 
     # list_reverseiterator = type(iter(reversed([])))
     # prints_like_iter(list_reverseiterator)
 
+def test_iter_printing_range():
     range_iterator = type(iter(range(0)))
     prints_like_iter(range_iterator)
     # <class 'range_iterator'>
@@ -83,18 +86,22 @@ def test_iter():
     prints_like_iter(longrange_iterator)
     # <class 'longrange_iterator'>
 
+def test_iter_printing_set():
     set_iterator = type(iter(set()))
     prints_like_iter(set_iterator)
     # <class 'set_iterator'>
 
+def test_iter_printing_str():
     str_iterator = type(iter(""))
     prints_like_iter(str_iterator)
     # <class 'str_iterator'>
 
+def test_iter_printing_tuple():
     tuple_iterator = type(iter(()))
     prints_like_iter(tuple_iterator)
     # <class 'tuple_iterator'>
 
+def test_iter_printing_zip():
     zip_iterator = type(iter(zip()))
     assert str(zip_iterator) == "<class 'zip'>"
     # <class 'zip'>

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/PZipBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.
  * Copyright (c) 2014, Regents of the University of California
  *
  * All rights reserved.
@@ -61,7 +61,7 @@ Object doEmpty(@SuppressWarnings("unused") PZip self) {
             throw raise(PythonErrorType.StopIteration);
         }
 
-        @Specialization
+        @Specialization(guards = "!isEmpty(self.getIterators())")
         Object doNext(VirtualFrame frame, PZip self,
                         @Cached("create()") GetNextNode next) {
             Object[] iterators = self.getIterators();