summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2015-10-08 16:06:39 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2015-10-08 16:06:39 (GMT)
commit666e6e1b4b7990c7095b1c37a742bcda585126d9 (patch)
tree16e50d8b189efd912fff053f9f6c041c34c24d22
parent12c2945ccf8624e3978c5d2069dd18194f88becf (diff)
parent3cc6da2b07a8aa78ec53a3ff5ea8d620f4753db6 (diff)
downloadcpython-666e6e1b4b7990c7095b1c37a742bcda585126d9.zip
cpython-666e6e1b4b7990c7095b1c37a742bcda585126d9.tar.gz
cpython-666e6e1b4b7990c7095b1c37a742bcda585126d9.tar.bz2
Merge from 3.5
-rw-r--r--Misc/NEWS2
-rw-r--r--Tools/buildbot/test.bat2
2 files changed, 3 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index b543088..697ddb0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -417,6 +417,8 @@ Documentation
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
index d1f5f52..ff7d167 100644
--- a/Tools/buildbot/test.bat
+++ b/Tools/buildbot/test.bat
@@ -16,4 +16,4 @@ if "%1"=="+q" (set rt_opts=%rt_opts:-q=%) & shift & goto CheckOpts
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%