diff options
| author | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 13:28:07 +0000 |
|---|---|---|
| committer | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 13:28:07 +0000 |
| commit | 2e4b7ab3b083c3f0de8ec4ba9c8d4bee06833808 (patch) | |
| tree | f8dd034e81cfe3a94f2eb0a3a17d3a0769919d57 /content/worker | |
| parent | da3a48b9680e3c82436fbe90f90c99c9bab20d4a (diff) | |
| download | chromium_src-2e4b7ab3b083c3f0de8ec4ba9c8d4bee06833808.zip chromium_src-2e4b7ab3b083c3f0de8ec4ba9c8d4bee06833808.tar.gz chromium_src-2e4b7ab3b083c3f0de8ec4ba9c8d4bee06833808.tar.bz2 | |
Disable WebSocket related tests only in Win32
Disable ExtensionApiTest.WebSocket, WorkerWebSocketLayoutTests, and PPAPI
WebSocket related tests only in Win32
BUG=111165
TEST=browser_tests; ui_tests
TBR=hbono@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9288018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119054 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/worker')
| -rw-r--r-- | content/worker/test/worker_uitest.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/content/worker/test/worker_uitest.cc b/content/worker/test/worker_uitest.cc index 06d1297..38c40d3 100644 --- a/content/worker/test/worker_uitest.cc +++ b/content/worker/test/worker_uitest.cc @@ -474,7 +474,12 @@ TEST_F(WorkerTest, DISABLED_WorkerHttpLayoutTests) { // TODO(toyoshim): Enable disabled tests. // http://crbug.com/111165 . -TEST_F(WorkerTest, DISABLED_WorkerWebSocketLayoutTests) { +#if defined(OS_WIN) +#define MAYBE_WorkerWebSocketLayoutTests DISABLED_WorkerWebSocketLayoutTests +#else +#define MAYBE_WorkerWebSocketLayoutTests WorkerWebSocketLayoutTests +#endif +TEST_F(WorkerTest, MAYBE_WorkerWebSocketLayoutTests) { static const char* kLayoutTestFiles[] = { "close-in-onmessage-crash.html", "close-in-shared-worker.html", |