[Python-checkins] cpython (merge 3.5 -> default): Merge from 3.5

[steve.dower]

https://hg.python.org/cpython/rev/0b7cccd9c7d5
changeset:   98600:0b7cccd9c7d5
parent:      98598:62897db9ae51
parent:      98599:0b7df139a5f7
user:        Steve Dower <steve.dower at microsoft.com>
date:        Thu Oct 08 09:06:39 2015 -0700
summary:
  Merge from 3.5

files:
  Misc/NEWS               |  2 ++
  Tools/buildbot/test.bat |  2 +-
  2 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -417,6 +417,8 @@
 Tests
 -----
 
+- Issue #23919: Prevents assert dialogs appearing in the test suite.
+
 - PCbuild\rt.bat now accepts an unlimited number of arguments to pass along
   to regrtest.py.  Previously there was a limit of 9.
 
diff --git a/Tools/buildbot/test.bat b/Tools/buildbot/test.bat
--- a/Tools/buildbot/test.bat
+++ b/Tools/buildbot/test.bat
@@ -16,4 +16,4 @@
 if NOT "%1"=="" (set regrtest_args=%regrtest_args% %1) & shift & goto CheckOpts
 
 echo on
-call "%here%..\..\PCbuild\rt.bat" %rt_opts% -uall -rwW -n --timeout=3600 %regrtest_args%
+call "%here%..\..\PCbuild\rt.bat" %rt_opts% -uall -rwW --timeout=3600 %regrtest_args%

-- 
Repository URL: https://hg.python.org/cpython