Skip trace mode tests if not supported

Author: fangerer

graalpython/com.oracle.graal.python.hpy.test/src/hpytest/support.py

@@ -541,6 +541,17 @@ def supports_debug_mode():
         except:
             return False
 
+    @staticmethod
+    def supports_trace_mode():
+        """ Returns True if the underlying Python implementation supports
+            the trace mode.
+        """
+        from hpy.universal import _trace
+        try:
+            return _trace.get_call_counts() is not None
+        except:
+            return False
+
 
 class HPyDebugCapture:
     """

graalpython/com.oracle.graal.python.hpy.test/src/hpytest/trace/test_trace.py

@@ -22,8 +22,11 @@
 # SOFTWARE.
 
 import pytest
+from hpytest.support import HPyTest
 from hpy.trace import get_call_counts, get_durations, set_trace_functions
 
+pytestmark = pytest.mark.skipif(not HPyTest.supports_trace_mode(), reason="trace mode not supported")
+
 @pytest.fixture
 def hpy_abi():
     return "trace"

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

@@ -57,7 +57,9 @@
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContext;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
+import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
+import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.function.BuiltinFunctionRootNode;
@@ -112,7 +114,7 @@ public void postInitialize(Python3Core core) {
              * Error case: install "not_available" for everything. So, loading still works, but you
              * cannot use it.
              */
-            PBuiltinFunction notAvailableObj = createFunction(core);
+            PythonBuiltinObject notAvailableObj = createFunction(core, hpyDebugModule);
             for (TruffleString tkey : keys) {
                 hpyDebugModule.setAttribute(tkey, notAvailableObj);
             }
@@ -128,14 +130,15 @@ public Object execute(VirtualFrame frame) {
     }
 
     @TruffleBoundary
-    static PBuiltinFunction createFunction(Python3Core core) {
+    static PBuiltinMethod createFunction(Python3Core core, PythonModule module) {
         Builtin builtin = NotAvailable.class.getAnnotation(Builtin.class);
         RootCallTarget callTarget = core.getLanguage().createCachedCallTarget(l -> {
             NodeFactory<PythonBuiltinBaseNode> nodeFactory = new BuiltinFunctionRootNode.StandaloneBuiltinFactory<>(new NotAvailable());
             return new BuiltinFunctionRootNode(l, builtin, nodeFactory, false);
         }, NotAvailable.class, builtin.name());
         int flags = PBuiltinFunction.getFlags(builtin, callTarget);
         TruffleString name = PythonUtils.toTruffleStringUncached(builtin.name());
-        return core.factory().createBuiltinFunction(name, null, 0, flags, callTarget);
+        PBuiltinFunction fun = core.factory().createBuiltinFunction(name, null, 0, flags, callTarget);
+        return core.factory().createBuiltinMethod(module, fun);
     }
 }

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

@@ -53,8 +53,8 @@
 import com.oracle.graal.python.builtins.objects.cext.common.LoadCExtException.ImportException;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContext;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
-import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
+import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.object.GetDictIfExistsNode;
 import com.oracle.graal.python.util.PythonUtils;
@@ -94,7 +94,7 @@ public void postInitialize(Python3Core core) {
              * Error case: install "not_available" for everything. So, loading still works, but you
              * cannot use it.
              */
-            PBuiltinFunction notAvailableObj = GraalHPyDebugModuleBuiltins.createFunction(core);
+            PythonBuiltinObject notAvailableObj = GraalHPyDebugModuleBuiltins.createFunction(core, hpyTraceModule);
             for (TruffleString tkey : keys) {
                 hpyTraceModule.setAttribute(tkey, notAvailableObj);
             }