summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2009-10-19 15:31:21 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2009-10-19 15:31:21 (GMT)
commit3714a69296d13eec28f2e50dc14fa6c7438a4e6d (patch)
tree9eacde171899caf0188215a309632e697c6a390d
parentd8c23f3849c159f7943cdf97953ea95f6fc6d241 (diff)
downloadcpython-3714a69296d13eec28f2e50dc14fa6c7438a4e6d.zip
cpython-3714a69296d13eec28f2e50dc14fa6c7438a4e6d.tar.gz
cpython-3714a69296d13eec28f2e50dc14fa6c7438a4e6d.tar.bz2
Blocked revisions 75513 via svnmerge
................ r75513 | r.david.murray | 2009-10-19 11:26:16 -0400 (Mon, 19 Oct 2009) | 18 lines Merged revisions 75503 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75503 | r.david.murray | 2009-10-18 17:12:37 -0400 (Sun, 18 Oct 2009) | 11 lines Issue #7151: regrtest would generate a JSON failure if there was output to stderr during the test run and it happened to get emitted after the worker thread emitted the result JSON. Now we capture stdout and stderr separately, which avoids that problem. It also means that _all_ stderr output is after all stdout output when we print the test results, but that seems acceptable, since output ordering is not guaranteed anyway. The patch also moves the emit of the test name into the output block generated after the test completes. Otherwise test names and test output/errors were mixed in the terminal display, making it difficult to determine which test generated the output. ........ ................
0 files changed, 0 insertions, 0 deletions