Enable debugging

tminka · tminka · commit bbe316f5fd71 · 2020-12-17T17:57:48.000Z
diff --git a/pythonnet.sln b/pythonnet.sln
diff --git a/setup.py b/setup.py
@@ -110,7 +110,7 @@ def initialize_options(self):
 
     def finalize_options(self):
         if self.dotnet_config is None:
-            self.dotnet_config = "release"
+            self.dotnet_config = "debug"
 
         build = self.distribution.get_command_obj("build")
         build.ensure_finalized()
diff --git a/src/clrmodule/ClrModule.cs b/src/clrmodule/ClrModule.cs
@@ -26,6 +26,7 @@
 using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
+
 using NXPorts.Attributes;
 
 public class clrModule
@@ -62,9 +63,9 @@ public static IntPtr PyInit_clr()
             pythonRuntime = Assembly.Load(pythonRuntimeName);
             DebugPrint("Success loading 'Python.Runtime' using standard binding rules.");
         }
-        catch (IOException)
+        catch (IOException ex)
         {
-            DebugPrint("'Python.Runtime' not found using standard binding rules.");
+            DebugPrint($"'Python.Runtime' not found using standard binding rules: {ex}");
             try
             {
                 // If the above fails for any reason, we fallback to attempting to load "Python.Runtime.dll"
@@ -78,6 +79,10 @@ public static IntPtr PyInit_clr()
 
                 Assembly executingAssembly = Assembly.GetExecutingAssembly();
                 string assemblyDirectory = Path.GetDirectoryName(executingAssembly.Location);
+#if DEBUG
+                string newAssemblyDirectory = Path.Combine(assemblyDirectory, @"..\..\..\src\runtime\bin\Debug\netstandard2.0");
+                if (Directory.Exists(newAssemblyDirectory)) assemblyDirectory = newAssemblyDirectory;
+#endif
                 if (assemblyDirectory == null)
                 {
                     throw new InvalidOperationException(executingAssembly.Location);
diff --git a/src/embed_tests/Python.EmbeddingTest.csproj b/src/embed_tests/Python.EmbeddingTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/runtime/Properties/launchSettings.json b/src/runtime/Properties/launchSettings.json
@@ -0,0 +1,9 @@
+{
+  "profiles": {
+    "Python.Runtime": {
+      "commandName": "Executable",
+      "executablePath": "C:\\Users\\minka\\Depots\\pythonnet\\src\\tests\\Pythonnet\\Scripts\\python.exe",
+      "commandLineArgs": "\\users\\minka\\Depots\\pythonnet\\src\\tests\\runtests.py \\users\\minka\\Depots\\pythonnet\\src\\tests"
+    }
+  }
+}
diff --git a/src/runtime/Python.Runtime.csproj b/src/runtime/Python.Runtime.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <Platforms>AnyCPU</Platforms>
     <RootNamespace>Python.Runtime</RootNamespace>
     <AssemblyName>Python.Runtime</AssemblyName>
@@ -17,6 +17,8 @@
 
   <PropertyGroup>
     <DefineConstants>TRACE;PYTHON37;WINDOWS</DefineConstants>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(PythonInteropFile)' != '' ">
diff --git a/src/tests/conftest.py b/src/tests/conftest.py
@@ -11,6 +11,16 @@
 
 import pytest
 
+#if os.getenv('_PYTEST_RAISE', "0") != "0":
+
+#@pytest.hookimpl(tryfirst=True)
+#def pytest_exception_interact(call):
+#    raise call.excinfo.value
+
+#@pytest.hookimpl(tryfirst=True)
+#def pytest_internalerror(excinfo):
+#    raise excinfo.value
+
 # Add path for `Python.Test`
 cwd = os.path.dirname(__file__)
 fixtures_path = os.path.join(cwd, "fixtures")
diff --git a/src/tests/runtests.py b/src/tests/runtests.py
@@ -14,7 +14,7 @@
     print("Load clr import hook")
     import clr
 
-    clr.AddReference("Python.Test")
+    #clr.AddReference("Python.Test")
     clr.AddReference("System.Collections")
     clr.AddReference("System.Data")
     clr.AddReference("System.Management")
@@ -29,6 +29,8 @@ def main(verbosity=1):
     # FIXME: test_engine has tests that are being skipped.
     # FIXME: test_subclass has tests that are being skipped.
     pytest.main()
+    print("Done")
+    input()
 
 
 if __name__ == '__main__':
diff --git a/src/tests/tests.pyproj b/src/tests/tests.pyproj
@@ -28,6 +28,7 @@
     <VisualStudioVersion Condition=" '$(VisualStudioVersion)' == '' ">10.0</VisualStudioVersion>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="conftest.py" />
     <Compile Include="__init__.py" />
     <Compile Include="_missing_import.py" />
     <Compile Include="leaktest.py" />
