diff options
author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 19:01:44 +0000 |
---|---|---|
committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 19:01:44 +0000 |
commit | 71e46cdd37f11fe5a334831a87d7db7d59478b46 (patch) | |
tree | 3ec11a9b4f40081037734c9aae0bde1dbc28b8b9 /chrome/browser/safe_browsing/safe_browsing_test.cc | |
parent | 877c69eca972ab2c9ce2022e9987c9e7956a5c94 (diff) | |
download | chromium_src-71e46cdd37f11fe5a334831a87d7db7d59478b46.zip chromium_src-71e46cdd37f11fe5a334831a87d7db7d59478b46.tar.gz chromium_src-71e46cdd37f11fe5a334831a87d7db7d59478b46.tar.bz2 |
Run safebrowsing_test_server with stdout and stderr unbuffered, to prevent incomplete stderr on win bots.
Also fixes mixed up ordering of stdout and stderr.
BUG=96459
TEST=introduced intentional error, ran test on win with scripts\slave\runtest.py, observed output.
Review URL: https://chromiumcodereview.appspot.com/10068003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132028 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/safe_browsing/safe_browsing_test.cc')
-rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_test.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc index 9e41405..877d943 100644 --- a/chrome/browser/safe_browsing/safe_browsing_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_test.cc @@ -145,6 +145,9 @@ class SafeBrowsingTestServer { FilePath python_runtime; EXPECT_TRUE(GetPythonRunTime(&python_runtime)); CommandLine cmd_line(python_runtime); + // Make python stdout and stderr unbuffered, to prevent incomplete stderr on + // win bots, and also fix mixed up ordering of stdout and stderr. + cmd_line.AppendSwitch("-u"); FilePath datafile = testserver_path.Append(datafile_); cmd_line.AppendArgPath(testserver); cmd_line.AppendArg(base::StringPrintf("--port=%d", kPort_)); |