diff options
| author | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-30 23:20:46 +0000 |
|---|---|---|
| committer | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-30 23:20:46 +0000 |
| commit | 2da8d317072968241f986ffed0be477900831889 (patch) | |
| tree | 761eedfabaaba837480c3604c0cfcf10e8d7d07c /webkit/webkit.sln | |
| parent | b9a0b1b39c5bcf551178cab7a2aa5f24d5afc929 (diff) | |
| download | chromium_src-2da8d317072968241f986ffed0be477900831889.zip chromium_src-2da8d317072968241f986ffed0be477900831889.tar.gz chromium_src-2da8d317072968241f986ffed0be477900831889.tar.bz2 | |
Reland changes to enable worker layout tests. Compared to last review (http://codereview.chromium.org/50045), the following changes are made:
1) Add chrome/test/worker/DEPS to address checkdeps error.
2) Change test_expectations.txt to skip some worker layout tests.
3) Add test_worker.vcproj to webkit.sln so that test_worker.dll can be built for WebKit build.
Review URL: http://codereview.chromium.org/56074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12822 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit.sln')
| -rw-r--r-- | webkit/webkit.sln | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/webkit/webkit.sln b/webkit/webkit.sln index aa2b459..7e25d4f 100644 --- a/webkit/webkit.sln +++ b/webkit/webkit.sln @@ -231,6 +231,30 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "printing", "..\printing\pri EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icui18n", "..\third_party\icu38\icui18n.vcproj", "{F22022F0-2D3B-5610-4E80-C674A8E01C5A}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_worker", "..\chrome\test\worker\test_worker.vcproj", "{3E03D462-780D-4C4D-B22E-5E095E6CF110}" + ProjectSection(ProjectDependencies) = postProject + {1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165} + {1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6} + {238CE175-76CE-4A25-A676-69D115885601} = {238CE175-76CE-4A25-A676-69D115885601} + {326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243} + {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} + {5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6} + {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} + {625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0} + {7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D} + {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} + {A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551} + {AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6} + {C0334F9A-1168-4101-9DD8-C30FB252D435} = {C0334F9A-1168-4101-9DD8-C30FB252D435} + {C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD} + {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} + {CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D} + {D6047981-23AE-4623-9373-514FDAFAE60F} = {D6047981-23AE-4623-9373-514FDAFAE60F} + {EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {EF5E94AB-B646-4E5B-A058-52EF07B8351C} + {F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51} + {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -285,6 +309,10 @@ Global {326E9795-E760-410A-B69A-3F79DB3F5243}.Debug|Win32.Build.0 = Debug|Win32 {326E9795-E760-410A-B69A-3F79DB3F5243}.Release|Win32.ActiveCfg = Release|Win32 {326E9795-E760-410A-B69A-3F79DB3F5243}.Release|Win32.Build.0 = Release|Win32 + {3E03D462-780D-4C4D-B22E-5E095E6CF110}.Debug|Win32.ActiveCfg = Debug|Win32 + {3E03D462-780D-4C4D-B22E-5E095E6CF110}.Debug|Win32.Build.0 = Debug|Win32 + {3E03D462-780D-4C4D-B22E-5E095E6CF110}.Release|Win32.ActiveCfg = Release|Win32 + {3E03D462-780D-4C4D-B22E-5E095E6CF110}.Release|Win32.Build.0 = Release|Win32 {494E414B-1655-48CE-996D-6413ECFB7829}.Debug|Win32.ActiveCfg = Debug|Win32 {494E414B-1655-48CE-996D-6413ECFB7829}.Debug|Win32.Build.0 = Debug|Win32 {494E414B-1655-48CE-996D-6413ECFB7829}.Release|Win32.ActiveCfg = Release|Win32 @@ -446,6 +474,7 @@ Global {2E2D3301-2EC4-4C0F-B889-87073B30F673} = {1DFD10B5-A673-4C3A-BA1D-3546FC4B7740} {2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D} {326E9795-E760-410A-B69A-3F79DB3F5243} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B} + {3E03D462-780D-4C4D-B22E-5E095E6CF110} = {4A249B49-19FB-4BD1-B017-718E7A4448EF} {494E414B-1655-48CE-996D-6413ECFB7829} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D} {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {1DFD10B5-A673-4C3A-BA1D-3546FC4B7740} {5597AD47-3494-4750-A235-4F9C2F864700} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D} |