Merged revisions 70908 via svnmerge from

jesse.noller · jesse.noller · commit c4d063f46161 · 2009-03-31T22:36:44.000Z
svn+ssh://pythondev@svn.python.org/python/trunk ........ r70908 | jesse.noller | 2009-03-31 17:20:35 -0500 (Tue, 31 Mar 2009) | 1 line Issue 5619: Pass MS CRT debug flags into subprocesses ........ git-svn-id: http://svn.python.org/projects/python/branches/py3k@70913 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -689,6 +689,7 @@ Daniel Stutzbach
 Nathan Sullivan
 Mark Summerfield
 Hisao Suzuki
+Andrew Svetlov
 Kalle Svensson
 Andrew Svetlov
 Paul Swartz
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -53,6 +53,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #5619: Multiprocessing children disobey the debug flag and causes
+  popups on windows buildbots. Patch applied to work around this issue.
+
 - Issue #5400: Added patch for multiprocessing on netbsd compilation/support
 
 - Issue #5387: Fixed mmap.move crash by integer overflow.
diff --git a/Modules/_multiprocessing/win32_functions.c b/Modules/_multiprocessing/win32_functions.c
@@ -130,6 +130,12 @@ win32_ExitProcess(PyObject *self, PyObject *args)
 	if (!PyArg_ParseTuple(args, "I", &uExitCode))
 		return NULL;
 
+	#if defined(Py_DEBUG)
+		SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOALIGNMENTFAULTEXCEPT|SEM_NOGPFAULTERRORBOX|SEM_NOOPENFILEERRORBOX);
+		_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
+	#endif
+
+
 	ExitProcess(uExitCode);
 
 	return NULL;
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
@@ -2006,6 +2006,7 @@ void
 Py_FatalError(const char *msg)
 {
 	fprintf(stderr, "Fatal Python error: %s\n", msg);
+	fflush(stderr); /* it helps in Windows debug build */
 	if (PyErr_Occurred()) {
 		PyErr_Print();
 	}

Original file line number	Diff line number	Diff line change
`@@ -2006,6 +2006,7 @@ void`
`2006`	`2006`	`Py_FatalError(const char *msg)`
`2007`	`2007`	`{`
`2008`	`2008`	`fprintf(stderr, "Fatal Python error: %s\n", msg);`
	`2009`	`+ fflush(stderr); /* it helps in Windows debug build */`
`2009`	`2010`	`if (PyErr_Occurred()) {`
`2010`	`2011`	`PyErr_Print();`
`2011`	`2012`	`}`