diff options
| author | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-21 07:20:35 +0000 |
|---|---|---|
| committer | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-21 07:20:35 +0000 |
| commit | 819d805666a21dde460e535afc6a0ae1139fa841 (patch) | |
| tree | c5a0e86f01f0eabfd0efba4dd26428aa83f0ad28 /chrome | |
| parent | 3498bb4642c3b2ec841e7464ca35db3eb48eb1c0 (diff) | |
| download | chromium_src-819d805666a21dde460e535afc6a0ae1139fa841.zip chromium_src-819d805666a21dde460e535afc6a0ae1139fa841.tar.gz chromium_src-819d805666a21dde460e535afc6a0ae1139fa841.tar.bz2 | |
Specify --chromium flag to run new-run-webkit-websocketserver
WebKit r59595,r59823 adds --chromium flag in new-run-webkit-websocketserver.
It is necessary to use Chromium port obj in the script to set up
cygwin environment on win bot.
BUGS=41319,40995
TEST=none
Review URL: http://codereview.chromium.org/1710007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47898 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/extensions/extension_websocket_apitest.cc | 7 | ||||
| -rw-r--r-- | chrome/test/ui_test_utils.cc | 4 | ||||
| -rw-r--r-- | chrome/worker/worker_uitest.cc | 6 |
3 files changed, 3 insertions, 14 deletions
diff --git a/chrome/browser/extensions/extension_websocket_apitest.cc b/chrome/browser/extensions/extension_websocket_apitest.cc index 96aad30..3d2b6a5 100644 --- a/chrome/browser/extensions/extension_websocket_apitest.cc +++ b/chrome/browser/extensions/extension_websocket_apitest.cc @@ -7,13 +7,6 @@ #include "chrome/test/ui_test_utils.h" #include "net/base/mock_host_resolver.h" -// Disable this test on Windows, because it fails -// http://crbug.com/40976, http://crbug.com/41319 -// https://bugs.webkit.org/show_bug.cgi?id=37518 -#if defined(OS_WIN) -#define WebSocket DISABLED_WebSocket -#endif - IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebSocket) { FilePath websocket_root_dir; PathService::Get(chrome::DIR_TEST_DATA, &websocket_root_dir); diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc index 0a4c792..b564c9f 100644 --- a/chrome/test/ui_test_utils.cc +++ b/chrome/test/ui_test_utils.cc @@ -577,7 +577,7 @@ void AppendToPythonPath(const FilePath& dir) { ::SetEnvironmentVariableW(kPythonPath, dir.value().c_str()); } else if (!wcsstr(oldpath, dir.value().c_str())) { std::wstring newpath(oldpath); - newpath.append(L":"); + newpath.append(L";"); newpath.append(dir.value()); SetEnvironmentVariableW(kPythonPath, newpath.c_str()); } @@ -600,6 +600,7 @@ void AppendToPythonPath(const FilePath& dir) { TestWebSocketServer::TestWebSocketServer(const FilePath& root_directory) { scoped_ptr<CommandLine> cmd_line(CreateWebSocketServerCommandLine()); cmd_line->AppendSwitchWithValue("server", "start"); + cmd_line->AppendSwitch("chromium"); cmd_line->AppendSwitch("register_cygwin"); cmd_line->AppendSwitchWithValue("root", root_directory.ToWStringHack()); temp_dir_.CreateUniqueTempDir(); @@ -646,6 +647,7 @@ CommandLine* TestWebSocketServer::CreateWebSocketServerCommandLine() { TestWebSocketServer::~TestWebSocketServer() { scoped_ptr<CommandLine> cmd_line(CreateWebSocketServerCommandLine()); cmd_line->AppendSwitchWithValue("server", "stop"); + cmd_line->AppendSwitch("chromium"); cmd_line->AppendSwitchWithValue("pidfile", websocket_pid_file_.ToWStringHack()); base::LaunchApp(*cmd_line.get(), true, false, NULL); diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc index 096917e..8ada3f2 100644 --- a/chrome/worker/worker_uitest.cc +++ b/chrome/worker/worker_uitest.cc @@ -418,12 +418,6 @@ TEST_F(WorkerTest, FLAKY_WorkerHttpLayoutTests) { StopHttpServer(); } -// http://crbug.com/40995 -// https://bugs.webkit.org/show_bug.cgi?id=37518 -#if defined(OS_WIN) -#define WorkerWebSocketLayoutTests DISABLED_WorkerWebSocketLayoutTests -#endif - TEST_F(WorkerTest, WorkerWebSocketLayoutTests) { static const char* kLayoutTestFiles[] = { "worker-simple.html", |