| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -17,7 +17,12 @@ jobs: | |||
| 17 | 17 | matrix: | |
| 18 | 18 | os: [windows, ubuntu, macos] | |
| 19 | 19 | python: ["3.6", "3.7", "3.8", "3.9", "3.10"] | |
| 20 | - platform: [x64] | ||
| 20 | + platform: [x64, x86] | ||
| 21 | + exclude: | ||
| 22 | + - os: ubuntu | ||
| 23 | + platform: x86 | ||
| 24 | + - os: macos | ||
| 25 | + platform: x86 | ||
| 21 | 26 | ||
| 22 | 27 | steps: | |
| 23 | 28 | - name: Set Environment on macOS | |
@@ -67,6 +72,7 @@ jobs: | |||
| 67 | 72 | run: pytest --runtime mono | |
| 68 | 73 | ||
| 69 | 74 | - name: Python Tests (.NET Core) | |
| 75 | + if: ${{ matrix.platform == 'x64' }} | ||
| 70 | 76 | run: pytest --runtime netcore | |
| 71 | 77 | ||
| 72 | 78 | - name: Python Tests (.NET Framework) | |
@@ -77,7 +83,7 @@ jobs: | |||
| 77 | 83 | run: dotnet test --runtime any-${{ matrix.platform }} src/python_tests_runner/ | |
| 78 | 84 | ||
| 79 | 85 | - name: Perf tests | |
| 80 | - if: ${{ matrix.python == '3.8' }} | ||
| 86 | + if: ${{ (matrix.python == '3.8') && (matrix.platform == 'x64') }} | ||
| 81 | 87 | run: | | |
| 82 | 88 | pip install --force --no-deps --target src/perf_tests/baseline/ pythonnet==2.5.2 | |
| 83 | 89 | dotnet test --configuration Release --runtime any-${{ matrix.platform }} --logger "console;verbosity=detailed" src/perf_tests/ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -10,7 +10,7 @@ struct NativeTypeSpec : IDisposable | |||
| 10 | 10 | public readonly StrPtr Name; | |
| 11 | 11 | public readonly int BasicSize; | |
| 12 | 12 | public readonly int ItemSize; | |
| 13 | - public readonly IntPtr Flags; | ||
| 13 | + public readonly int Flags; | ||
| 14 | 14 | public IntPtr Slots; | |
| 15 | 15 | ||
| 16 | 16 | public NativeTypeSpec(TypeSpec spec) | |
@@ -20,7 +20,7 @@ public NativeTypeSpec(TypeSpec spec) | |||
| 20 | 20 | this.Name = new StrPtr(spec.Name, Encoding.UTF8); | |
| 21 | 21 | this.BasicSize = spec.BasicSize; | |
| 22 | 22 | this.ItemSize = spec.ItemSize; | |
| 23 | - this.Flags = new IntPtr((long)spec.Flags); | ||
| 23 | + this.Flags = (int)spec.Flags; | ||
| 24 | 24 | ||
| 25 | 25 | unsafe | |
| 26 | 26 | { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -86,7 +86,11 @@ def pytest_configure(config): | |||
| 86 | 86 | else: | |
| 87 | 87 | domain_tests_dir = os.path.join(os.path.dirname(__file__), "domain_tests") | |
| 88 | 88 | bin_path = os.path.join(domain_tests_dir, "bin") | |
| 89 | - check_call(["dotnet", "build", domain_tests_dir, "-o", bin_path]) | ||
| 89 | + build_cmd = ["dotnet", "build", domain_tests_dir, "-o", bin_path] | ||
| 90 | + is_64bits = sys.maxsize > 2**32 | ||
| 91 | + if not is_64bits: | ||
| 92 | + build_cmd += ["/p:Prefer32Bit=True"] | ||
| 93 | + check_call(build_cmd) | ||
| 90 | 94 | ||
| 91 | 95 | ||
| 92 | 96 | ||
| Back | FazBrowse Home | New Git URL |
0 commit comments