Commit88ecef6

committed

Revert "Merge pull request#1765 from losttech/bugs/32bit-1729"

This reverts commitab6d2c5, reversingchanges made to86c6a7f.

1 parent7247da5 commit88ecef6Copy full SHA for 88ecef6

File tree

-15

lines changed

-15

lines changed

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,7 @@ 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, x86]`
`21`		`-exclude:`
`22`		`- -os:ubuntu`
`23`		`-platform:x86`
`24`		`- -os:macos`
`25`		`-platform:x86`
	`20`	`+platform:[x64]`
`26`	`21`
`27`	`22`	`steps:`
`28`	`23`	`-name:Set Environment on macOS`
`@@ -72,7 +67,6 @@ jobs:`
`72`	`67`	`run:pytest --runtime mono`
`73`	`68`
`74`	`69`	`-name:Python Tests (.NET Core)`
`75`		`-if:${{ matrix.platform == 'x64' }}`
`76`	`70`	`run:pytest --runtime netcore`
`77`	`71`
`78`	`72`	`-name:Python Tests (.NET Framework)`
`@@ -83,7 +77,7 @@ jobs:`
`83`	`77`	`run:dotnet test --runtime any-${{ matrix.platform }} src/python_tests_runner/`
`84`	`78`
`85`	`79`	`-name:Perf tests`
`86`		`-if:${{(matrix.python == '3.8') && (matrix.platform == 'x64') }}`
	`80`	`+if:${{ matrix.python == '3.8' }}`
`87`	`81`	`run:\|`
`88`	`82`	`pip install --force --no-deps --target src/perf_tests/baseline/ pythonnet==2.5.2`
`89`	`83`	`dotnet test --configuration Release --runtime any-${{ matrix.platform }} --logger "console;verbosity=detailed" src/perf_tests/`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ struct NativeTypeSpec : IDisposable`
`10`	`10`	`publicreadonlyStrPtrName;`
`11`	`11`	`publicreadonlyintBasicSize;`
`12`	`12`	`publicreadonlyintItemSize;`
`13`		`-publicreadonlyintFlags;`
	`13`	`+publicreadonlyTypeFlagsFlags;`
`14`	`14`	`publicIntPtrSlots;`
`15`	`15`
`16`	`16`	`publicNativeTypeSpec(TypeSpecspec)`
`@@ -20,7 +20,7 @@ public NativeTypeSpec(TypeSpec spec)`
`20`	`20`	`this.Name=newStrPtr(spec.Name,Encoding.UTF8);`
`21`	`21`	`this.BasicSize=spec.BasicSize;`
`22`	`22`	`this.ItemSize=spec.ItemSize;`
`23`		`-this.Flags=(int)spec.Flags;`
	`23`	`+this.Flags=spec.Flags;`
`24`	`24`
`25`	`25`	`unsafe`
`26`	`26`	`{`

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -86,11 +86,7 @@ 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`		`-build_cmd= ["dotnet","build",domain_tests_dir,"-o",bin_path]`
`90`		`-is_64bits=sys.maxsize>2**32`
`91`		`-ifnotis_64bits:`
`92`		`-build_cmd+= ["/p:Prefer32Bit=True"]`
`93`		`-check_call(build_cmd)`
	`89`	`+check_call(["dotnet","build",domain_tests_dir,"-o",bin_path])`
`94`	`90`
`95`	`91`
`96`	`92`

Comments

(0)