Commit8afd512

authored

Merge pull request#365 from vmuriart/pyobject_finalize

Fix Pyobject GC Finalize & Enable NUnit Exit Code

2 parentsd82ca28 +c954442 commit8afd512Copy full SHA for 8afd512

File tree

-5

lines changed

-5

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].`
`12`	`12`	`- Code Coverage (#345)`
`13`	`13`	- Added`pysetargv` (#347)
`14`	`14`	`- Added XML Documentation (#349)`
	`15`	`+- Added Embedded tests on Appveyor (#353)`
`15`	`16`	`- Added PY3 settings to configuration-manager (#346)`
`16`	`17`
`17`	`18`	`###Changed`
`@@ -21,11 +22,11 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].`
`21`	`22`	- Completed refactor of Build Directives on`Runtime.cs` (#339)
`22`	`23`	`- Refactor python unittests (#329)`
`23`	`24`	`- Unfroze Mono version on Travis (#345)`
`24`		`-- Enabled Embedded tests on Appveyor (#353)`
`25`	`25`
`26`	`26`	`###Fixed`
`27`	`27`
`28`		`-- Fixed crash during Shutdown (#343)`
	`28`	`+- Fixed crash during Initialization (#343)`
	`29`	`+- Fixed crash during Shutdown (#365)`
`29`	`30`
`30`	`31`	`###Removed`
`31`	`32`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,7 @@ if ($NUNIT_STATUS -ne 0) {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`# Embedded tests failing due to open issues, pass/fail only on Python exit code`
`29`		`-# if ($PYTHON_STATUS -ne 0 -or $NUNIT_STATUS -ne 0) {`
`30`		`-if ($PYTHON_STATUS-ne0) {`
	`29`	`+if ($PYTHON_STATUS-ne0-or$NUNIT_STATUS-ne0) {`
`31`	`30`	`Write-Host"Tests failed"-ForegroundColor"Red"`
`32`	`31`	`$host.SetShouldExit(1)`
`33`	`32`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ protected virtual void Dispose(bool disposing)`
`113`	`113`	`{`
`114`	`114`	`if(!disposed)`
`115`	`115`	`{`
`116`		`-if(Runtime.Py_IsInitialized()>0)`
	`116`	`+if(Runtime.Py_IsInitialized()>0&&!Runtime.IsFinalizing)`
`117`	`117`	`{`
`118`	`118`	`IntPtrgs=PythonEngine.AcquireLock();`
`119`	`119`	`Runtime.XDecref(obj);`

Comments

(0)