[GR-11906] [GR-12029] Migrate to 'ProcessProperties'.

PullRequest: graalpython/222

Author: fangerer

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/module/MemoryviewTest.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2017, 2018, 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.
+ */
+package com.oracle.graal.python.test.module;
+
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Engine;
+import org.junit.Test;
+
+import com.oracle.graal.python.test.PythonTests;
+
+public class MemoryviewTest extends PythonTests {
+    @Test
+    public void testContextReuse() {
+        Engine engine = Engine.newBuilder().build();
+        try (Context context = newContext(engine)) {
+            context.eval("python", "memoryview(b'abc')");
+        }
+    }
+
+    private static Context newContext(Engine engine) {
+        return Context.newBuilder().allowAllAccess(true).engine(engine).build();
+    }
+}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -35,6 +35,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.ReentrantLock;
 
+import org.graalvm.nativeimage.ProcessProperties;
 import org.graalvm.options.OptionValues;
 
 import com.oracle.graal.python.PythonLanguage;
@@ -50,8 +51,8 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
-import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.TruffleOptions;
+import com.oracle.truffle.api.TruffleLanguage.Env;
 
 public final class PythonContext {
 
@@ -191,8 +192,8 @@ public void patch(Env newEnv) {
 
     private void setupRuntimeInformation() {
         PythonModule sysModule = core.initializeSysModule();
-        if (TruffleOptions.AOT) {
-            sysModule.setAttribute("executable", Compiler.command(new Object[]{"com.oracle.svm.core.posix.GetExecutableName"}));
+        if (TruffleOptions.AOT && !language.isNativeBuildTime()) {
+            sysModule.setAttribute("executable", ProcessProperties.getExecutableName());
         }
         sysModules = (PDict) sysModule.getAttribute("modules");
         builtinsModule = (PythonModule) sysModules.getItem("builtins");

mx.graalpython/mx_graalpython.py

@@ -393,8 +393,13 @@ def graalpython_gate_runner(args, tasks):
 
     with Task('GraalPython C extension tests', tasks, tags=[GraalPythonTags.cpyext]) as task:
         if task:
+            # we deliberately added this to test the combination of Sulong and 'mx_unittest'
+            unittest(['--regex', re.escape('com.oracle.graal.python.test.module.MemoryviewTest'),
+                      "-Dgraal.TraceTruffleCompilation=true"])
+
             gate_unittests(subdir="cpyext/")
 
+
     with Task('GraalPython C extension managed tests', tasks, tags=[GraalPythonTags.cpyext_managed]) as task:
         if task:
             mx.run_mx(["--dynamicimports", "sulong-managed", "python-gate-unittests", "--llvm.configuration=managed", "--subdir=cpyext", "--"])
@@ -407,13 +412,12 @@ def graalpython_gate_runner(args, tasks):
         if task:
             svm_image_name = "./graalpython-svm"
             if not os.path.exists(svm_image_name):
-                python_svm(["-h"])
-            else:
-                llvm_home = mx_subst.path_substitutions.substitute('--native.Dllvm.home=<path:SULONG_LIBS>')
-                args = ["--python.CoreHome=%s" % os.path.join(_suite.dir, "graalpython", "lib-graalpython"),
-                        "--python.StdLibHome=%s" % os.path.join(_suite.dir, "graalpython", "lib-python/3"),
-                        llvm_home]
-                run_python_unittests(svm_image_name, args)
+                svm_image_name = python_svm(["-h"])
+            llvm_home = mx_subst.path_substitutions.substitute('--native.Dllvm.home=<path:SULONG_LIBS>')
+            args = ["--python.CoreHome=%s" % os.path.join(_suite.dir, "graalpython", "lib-graalpython"),
+                    "--python.StdLibHome=%s" % os.path.join(_suite.dir, "graalpython", "lib-python/3"),
+                    llvm_home]
+            run_python_unittests(svm_image_name, args)
 
     with Task('GraalPython apptests', tasks, tags=[GraalPythonTags.apptests]) as task:
         if task:
@@ -448,6 +452,11 @@ def graalpython_gate_runner(args, tasks):
             ])
             if success not in out.data:
                 mx.abort('Output from generated SVM image "' + svm_image + '" did not match success pattern:\n' + success)
+            llvm_home = mx_subst.path_substitutions.substitute('--native.Dllvm.home=<path:SULONG_LIBS>')
+            args = ["--python.CoreHome=%s" % os.path.join(_suite.dir, "graalpython", "lib-graalpython"),
+                    "--python.StdLibHome=%s" % os.path.join(_suite.dir, "graalpython", "lib-python/3"),
+                    llvm_home]
+            run_python_unittests(svm_image, args)
 
 
 mx_gate.add_gate_runner(_suite, graalpython_gate_runner)

mx.graalpython/suite.py

@@ -25,15 +25,15 @@
             },
             {
                 "name": "sulong",
-                "version": "a8a599d132146bb0f87a2b95572db7d76b641b88",
+                "version": "97d30b8572cbae48cf8d8360f1dd4411f7cbaeec",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "a8a599d132146bb0f87a2b95572db7d76b641b88",
+                "version": "97d30b8572cbae48cf8d8360f1dd4411f7cbaeec",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},