Changeset 69656 in webkit
- Timestamp:
- Oct 13, 2010 6:58:47 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 10 added
- 6 edited
- 1 copied
-
WebKit/win/ChangeLog (modified) (1 diff)
-
WebKit/win/WebKit.vcproj/WebKit.sln (modified) (30 diffs)
-
WebKitTools/ChangeLog (modified) (1 diff)
-
WebKitTools/Scripts/build-api-tests (modified) (1 diff)
-
WebKitTools/Scripts/run-api-tests (modified) (5 diffs)
-
WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICFLite.vsprops (added)
-
WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICommon.vsprops (added)
-
WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICoreFoundation.vsprops (added)
-
WebKitTools/TestWebKitAPI/TestWebKitAPIPrefix.h (modified) (2 diffs)
-
WebKitTools/TestWebKitAPI/win (added)
-
WebKitTools/TestWebKitAPI/win/PlatformUtilitiesWin.cpp (added)
-
WebKitTools/TestWebKitAPI/win/PlatformWebViewWin.cpp (added)
-
WebKitTools/TestWebKitAPI/win/TestWebKitAPI.sln (added)
-
WebKitTools/TestWebKitAPI/win/TestWebKitAPI.vcproj (added)
-
WebKitTools/TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj (added)
-
WebKitTools/TestWebKitAPI/win/copy-resources.cmd (added)
-
WebKitTools/TestWebKitAPI/win/main.cpp (copied) (copied from trunk/WebKitTools/TestWebKitAPI/TestWebKitAPIPrefix.h) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/win/ChangeLog
r69561 r69656 1 2010-10-12 Adam Roben <aroben@apple.com> 2 3 Build TestWebKitAPI on Windows 4 5 Fixes <http://webkit.org/b/47552> <rdar://problem/8541708> Make 6 TestWebKitAPI work on Windows 7 8 Reviewed by Sam Weinig. 9 10 * WebKit.vcproj/WebKit.sln: Added TestWebKitAPI and 11 TestWebKitAPIGenerated and made them build just after 12 WebKitTestRunner. 13 1 14 2010-10-11 Shinichiro Hamaji <hamaji@chromium.org> 2 15 -
trunk/WebKit/win/WebKit.vcproj/WebKit.sln
r69145 r69656 136 136 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MiniBrowser", "..\..\..\WebKitTools\MiniBrowser\MiniBrowser.vcproj", "{1480CF5F-4160-47B5-A0E6-96AEC8258FB5}" 137 137 ProjectSection(ProjectDependencies) = postProject 138 {3E48AB23-D249-488F-A1C4-43CDF52FBD28} = {3E48AB23-D249-488F-A1C4-43CDF52FBD28} 139 EndProjectSection 140 EndProject 141 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestWebKitAPI", "..\..\..\WebKitTools\TestWebKitAPI\win\TestWebKitAPI.vcproj", "{3E48AB23-D249-488F-A1C4-43CDF52FBD28}" 142 ProjectSection(ProjectDependencies) = postProject 143 {45C45411-7F0E-404D-919A-4EE9BB60BE86} = {45C45411-7F0E-404D-919A-4EE9BB60BE86} 144 EndProjectSection 145 EndProject 146 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestWebKitAPIGenerated", "..\..\..\WebKitTools\TestWebKitAPI\win\TestWebKitAPIGenerated.vcproj", "{45C45411-7F0E-404D-919A-4EE9BB60BE86}" 147 ProjectSection(ProjectDependencies) = postProject 138 148 {3B99669B-1817-443B-BCBE-835580146668} = {3B99669B-1817-443B-BCBE-835580146668} 139 149 EndProjectSection … … 141 151 Global 142 152 GlobalSection(SolutionConfigurationPlatforms) = preSolution 153 all|Win32 = all|Win32 143 154 Debug_All|Win32 = Debug_All|Win32 144 155 Debug_Cairo|Win32 = Debug_Cairo|Win32 … … 149 160 EndGlobalSection 150 161 GlobalSection(ProjectConfigurationPlatforms) = postSolution 162 {011D10F1-B656-4A1B-A0C3-3842F02122C5}.all|Win32.ActiveCfg = Debug_All|Win32 163 {011D10F1-B656-4A1B-A0C3-3842F02122C5}.all|Win32.Build.0 = Debug_All|Win32 151 164 {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 152 165 {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_All|Win32.Build.0 = Debug_All|Win32 … … 161 174 {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.ActiveCfg = Release|Win32 162 175 {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.Build.0 = Release|Win32 176 {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.all|Win32.ActiveCfg = Debug_All|Win32 177 {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.all|Win32.Build.0 = Debug_All|Win32 163 178 {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 164 179 {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug_All|Win32.Build.0 = Debug_All|Win32 … … 173 188 {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|Win32.ActiveCfg = Release|Win32 174 189 {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|Win32.Build.0 = Release|Win32 190 {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.all|Win32.ActiveCfg = Debug_All|Win32 191 {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.all|Win32.Build.0 = Debug_All|Win32 175 192 {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 176 193 {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.Build.0 = Debug_All|Win32 … … 185 202 {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.ActiveCfg = Release|Win32 186 203 {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.Build.0 = Release|Win32 204 {C59E5129-B453-49B7-A52B-1E104715F76E}.all|Win32.ActiveCfg = Debug_All|Win32 205 {C59E5129-B453-49B7-A52B-1E104715F76E}.all|Win32.Build.0 = Debug_All|Win32 187 206 {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 188 207 {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.Build.0 = Debug_All|Win32 … … 197 216 {C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.ActiveCfg = Release|Win32 198 217 {C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.Build.0 = Release|Win32 218 {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.all|Win32.ActiveCfg = all|Win32 219 {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.all|Win32.Build.0 = all|Win32 199 220 {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.ActiveCfg = all|Win32 200 221 {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.Build.0 = all|Win32 … … 209 230 {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.ActiveCfg = all|Win32 210 231 {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.Build.0 = all|Win32 232 {0A324352-B3B6-496C-9E5B-4C7E923E628B}.all|Win32.ActiveCfg = all|Win32 233 {0A324352-B3B6-496C-9E5B-4C7E923E628B}.all|Win32.Build.0 = all|Win32 211 234 {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug_All|Win32.ActiveCfg = cairo|Win32 212 235 {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug_All|Win32.Build.0 = cairo|Win32 … … 221 244 {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release|Win32.ActiveCfg = all|Win32 222 245 {0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release|Win32.Build.0 = all|Win32 246 {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.all|Win32.ActiveCfg = Debug_All|Win32 247 {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.all|Win32.Build.0 = Debug_All|Win32 223 248 {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 224 249 {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug_All|Win32.Build.0 = Debug_All|Win32 … … 231 256 {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release|Win32.ActiveCfg = Release|Win32 232 257 {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release|Win32.Build.0 = Release|Win32 258 {1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.all|Win32.ActiveCfg = Debug_All|Win32 259 {1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.all|Win32.Build.0 = Debug_All|Win32 233 260 {1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 234 261 {1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Debug_All|Win32.Build.0 = Debug_All|Win32 … … 243 270 {1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Release|Win32.ActiveCfg = Release|Win32 244 271 {1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Release|Win32.Build.0 = Release|Win32 272 {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.all|Win32.ActiveCfg = Debug_All|Win32 273 {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.all|Win32.Build.0 = Debug_All|Win32 245 274 {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 246 275 {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Debug_All|Win32.Build.0 = Debug_All|Win32 … … 255 284 {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release|Win32.ActiveCfg = Release|Win32 256 285 {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release|Win32.Build.0 = Release|Win32 286 {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.all|Win32.ActiveCfg = all|Win32 287 {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.all|Win32.Build.0 = all|Win32 257 288 {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug_All|Win32.ActiveCfg = all|Win32 258 289 {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug_All|Win32.Build.0 = all|Win32 … … 267 298 {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release|Win32.ActiveCfg = all|Win32 268 299 {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release|Win32.Build.0 = all|Win32 300 {AAE88FEF-509E-4D49-870B-7357922C276F}.all|Win32.ActiveCfg = Debug_CFLite|Win32 301 {AAE88FEF-509E-4D49-870B-7357922C276F}.all|Win32.Build.0 = Debug_CFLite|Win32 269 302 {AAE88FEF-509E-4D49-870B-7357922C276F}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 270 303 {AAE88FEF-509E-4D49-870B-7357922C276F}.Debug_All|Win32.Build.0 = Debug_All|Win32 … … 279 312 {AAE88FEF-509E-4D49-870B-7357922C276F}.Release|Win32.ActiveCfg = Release|Win32 280 313 {AAE88FEF-509E-4D49-870B-7357922C276F}.Release|Win32.Build.0 = Release|Win32 314 {91762BE2-87EF-4F5A-A480-48B90EB3F406}.all|Win32.ActiveCfg = Release|Win32 315 {91762BE2-87EF-4F5A-A480-48B90EB3F406}.all|Win32.Build.0 = Release|Win32 281 316 {91762BE2-87EF-4F5A-A480-48B90EB3F406}.Debug_All|Win32.ActiveCfg = Debug|Win32 282 317 {91762BE2-87EF-4F5A-A480-48B90EB3F406}.Debug_All|Win32.Build.0 = Debug|Win32 … … 291 326 {91762BE2-87EF-4F5A-A480-48B90EB3F406}.Release|Win32.ActiveCfg = Release|Win32 292 327 {91762BE2-87EF-4F5A-A480-48B90EB3F406}.Release|Win32.Build.0 = Release|Win32 328 {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.all|Win32.ActiveCfg = Debug_All|Win32 329 {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.all|Win32.Build.0 = Debug_All|Win32 293 330 {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 294 331 {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug_All|Win32.Build.0 = Debug_All|Win32 … … 303 340 {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release|Win32.ActiveCfg = Release|Win32 304 341 {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release|Win32.Build.0 = Release|Win32 342 {B8437A41-67BC-4769-9452-45203827F821}.all|Win32.ActiveCfg = Debug_All|Win32 343 {B8437A41-67BC-4769-9452-45203827F821}.all|Win32.Build.0 = Debug_All|Win32 305 344 {B8437A41-67BC-4769-9452-45203827F821}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 306 345 {B8437A41-67BC-4769-9452-45203827F821}.Debug_All|Win32.Build.0 = Debug_All|Win32 … … 315 354 {B8437A41-67BC-4769-9452-45203827F821}.Release|Win32.ActiveCfg = Release|Win32 316 355 {B8437A41-67BC-4769-9452-45203827F821}.Release|Win32.Build.0 = Release|Win32 356 {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.all|Win32.ActiveCfg = Debug_All|Win32 357 {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.all|Win32.Build.0 = Debug_All|Win32 317 358 {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 318 359 {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug_All|Win32.Build.0 = Debug_All|Win32 … … 327 368 {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release|Win32.ActiveCfg = Release|Win32 328 369 {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release|Win32.Build.0 = Release|Win32 370 {59CC0547-70AC-499C-9B19-EC01C6F61137}.all|Win32.ActiveCfg = Debug_Cairo|Win32 371 {59CC0547-70AC-499C-9B19-EC01C6F61137}.all|Win32.Build.0 = Debug_Cairo|Win32 329 372 {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 330 373 {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_All|Win32.Build.0 = Debug_All|Win32 … … 339 382 {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release|Win32.ActiveCfg = Release|Win32 340 383 {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release|Win32.Build.0 = Release|Win32 384 {DA31DA52-6675-48D4-89E0-333A7144397C}.all|Win32.ActiveCfg = all|Win32 385 {DA31DA52-6675-48D4-89E0-333A7144397C}.all|Win32.Build.0 = all|Win32 341 386 {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.ActiveCfg = all|Win32 342 387 {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.Build.0 = all|Win32 … … 351 396 {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.ActiveCfg = all|Win32 352 397 {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.Build.0 = all|Win32 398 {44B9C152-1870-4035-B94D-7B3285AA0C12}.all|Win32.ActiveCfg = Release|Win32 399 {44B9C152-1870-4035-B94D-7B3285AA0C12}.all|Win32.Build.0 = Release|Win32 353 400 {44B9C152-1870-4035-B94D-7B3285AA0C12}.Debug_All|Win32.ActiveCfg = Release|Win32 354 401 {44B9C152-1870-4035-B94D-7B3285AA0C12}.Debug_All|Win32.Build.0 = Release|Win32 … … 363 410 {44B9C152-1870-4035-B94D-7B3285AA0C12}.Release|Win32.ActiveCfg = Release|Win32 364 411 {44B9C152-1870-4035-B94D-7B3285AA0C12}.Release|Win32.Build.0 = Release|Win32 412 {C0737398-3565-439E-A2B8-AB2BE4D5430C}.all|Win32.ActiveCfg = Debug_All|Win32 413 {C0737398-3565-439E-A2B8-AB2BE4D5430C}.all|Win32.Build.0 = Debug_All|Win32 365 414 {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 366 415 {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_All|Win32.Build.0 = Debug_All|Win32 … … 375 424 {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.ActiveCfg = Release|Win32 376 425 {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.Build.0 = Release|Win32 426 {626089A3-25D3-4883-A96C-B8C66E036397}.all|Win32.ActiveCfg = Debug_Cairo|Win32 427 {626089A3-25D3-4883-A96C-B8C66E036397}.all|Win32.Build.0 = Debug_Cairo|Win32 377 428 {626089A3-25D3-4883-A96C-B8C66E036397}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 378 429 {626089A3-25D3-4883-A96C-B8C66E036397}.Debug_All|Win32.Build.0 = Debug_All|Win32 … … 387 438 {626089A3-25D3-4883-A96C-B8C66E036397}.Release|Win32.ActiveCfg = Debug|Win32 388 439 {626089A3-25D3-4883-A96C-B8C66E036397}.Release|Win32.Build.0 = Debug|Win32 440 {D09806DB-E58B-4646-8C9B-61101906C1E2}.all|Win32.ActiveCfg = Release|Win32 441 {D09806DB-E58B-4646-8C9B-61101906C1E2}.all|Win32.Build.0 = Release|Win32 389 442 {D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug_All|Win32.ActiveCfg = Release|Win32 390 443 {D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug_All|Win32.Build.0 = Release|Win32 … … 399 452 {D09806DB-E58B-4646-8C9B-61101906C1E2}.Release|Win32.ActiveCfg = Release|Win32 400 453 {D09806DB-E58B-4646-8C9B-61101906C1E2}.Release|Win32.Build.0 = Release|Win32 454 {114FCA11-216B-4C8C-957E-30A75AE80443}.all|Win32.ActiveCfg = Debug_All|Win32 455 {114FCA11-216B-4C8C-957E-30A75AE80443}.all|Win32.Build.0 = Debug_All|Win32 401 456 {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 402 457 {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_All|Win32.Build.0 = Debug_All|Win32 … … 411 466 {114FCA11-216B-4C8C-957E-30A75AE80443}.Release|Win32.ActiveCfg = Release|Win32 412 467 {114FCA11-216B-4C8C-957E-30A75AE80443}.Release|Win32.Build.0 = Release|Win32 468 {CBC3391C-F060-4BF5-A66E-81404168816B}.all|Win32.ActiveCfg = Release_CFLite|Win32 469 {CBC3391C-F060-4BF5-A66E-81404168816B}.all|Win32.Build.0 = Release_CFLite|Win32 413 470 {CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 414 471 {CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_All|Win32.Build.0 = Debug_All|Win32 … … 423 480 {CBC3391C-F060-4BF5-A66E-81404168816B}.Release|Win32.ActiveCfg = Release|Win32 424 481 {CBC3391C-F060-4BF5-A66E-81404168816B}.Release|Win32.Build.0 = Release|Win32 482 {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.all|Win32.ActiveCfg = all|Win32 483 {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.all|Win32.Build.0 = all|Win32 425 484 {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug_All|Win32.ActiveCfg = all|Win32 426 485 {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug_All|Win32.Build.0 = all|Win32 … … 435 494 {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release|Win32.ActiveCfg = all|Win32 436 495 {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release|Win32.Build.0 = all|Win32 496 {3B99669B-1817-443B-BCBE-835580146668}.all|Win32.ActiveCfg = Release_CFLite|Win32 497 {3B99669B-1817-443B-BCBE-835580146668}.all|Win32.Build.0 = Release_CFLite|Win32 437 498 {3B99669B-1817-443B-BCBE-835580146668}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 438 499 {3B99669B-1817-443B-BCBE-835580146668}.Debug_All|Win32.Build.0 = Debug_All|Win32 … … 447 508 {3B99669B-1817-443B-BCBE-835580146668}.Release|Win32.ActiveCfg = Release|Win32 448 509 {3B99669B-1817-443B-BCBE-835580146668}.Release|Win32.Build.0 = Release|Win32 510 {1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.all|Win32.ActiveCfg = Release_CFLite|Win32 511 {1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.all|Win32.Build.0 = Release_CFLite|Win32 449 512 {1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 450 513 {1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Debug_All|Win32.Build.0 = Debug_All|Win32 … … 459 522 {1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Release|Win32.ActiveCfg = Release|Win32 460 523 {1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Release|Win32.Build.0 = Release|Win32 524 {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.all|Win32.ActiveCfg = Debug_All|Win32 525 {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.all|Win32.Build.0 = Debug_All|Win32 526 {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 527 {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug_All|Win32.Build.0 = Debug_All|Win32 528 {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug_Cairo|Win32.ActiveCfg = Debug_CFLite|Win32 529 {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug_Cairo|Win32.Build.0 = Debug_CFLite|Win32 530 {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug_Internal|Win32.ActiveCfg = Debug_Internal|Win32 531 {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug_Internal|Win32.Build.0 = Debug_Internal|Win32 532 {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug|Win32.ActiveCfg = Debug|Win32 533 {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug|Win32.Build.0 = Debug|Win32 534 {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_Cairo|Win32.ActiveCfg = Release_CFLite|Win32 535 {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_Cairo|Win32.Build.0 = Release_CFLite|Win32 536 {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release|Win32.ActiveCfg = Release|Win32 537 {3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release|Win32.Build.0 = Release|Win32 538 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.all|Win32.ActiveCfg = all|Win32 539 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.all|Win32.Build.0 = all|Win32 540 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_All|Win32.ActiveCfg = all|Win32 541 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_All|Win32.Build.0 = all|Win32 542 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_Cairo|Win32.ActiveCfg = all|Win32 543 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_Cairo|Win32.Build.0 = all|Win32 544 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_Internal|Win32.ActiveCfg = all|Win32 545 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_Internal|Win32.Build.0 = all|Win32 546 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug|Win32.ActiveCfg = all|Win32 547 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug|Win32.Build.0 = all|Win32 548 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_Cairo|Win32.ActiveCfg = all|Win32 549 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_Cairo|Win32.Build.0 = all|Win32 550 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release|Win32.ActiveCfg = all|Win32 551 {45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release|Win32.Build.0 = all|Win32 461 552 EndGlobalSection 462 553 GlobalSection(SolutionProperties) = preSolution … … 490 581 {3B99669B-1817-443B-BCBE-835580146668} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459} 491 582 {1480CF5F-4160-47B5-A0E6-96AEC8258FB5} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459} 583 {3E48AB23-D249-488F-A1C4-43CDF52FBD28} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459} 584 {45C45411-7F0E-404D-919A-4EE9BB60BE86} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459} 492 585 EndGlobalSection 493 586 EndGlobal -
trunk/WebKitTools/ChangeLog
r69650 r69656 1 2010-10-12 Adam Roben <aroben@apple.com> 2 3 Make TestWebKitAPI work on Windows 4 5 Fixes <http://webkit.org/b/47552> <rdar://problem/8541708>. 6 7 Reviewed by Sam Weinig. 8 9 * Scripts/build-api-tests: Build TestWebKitAPI.sln on Windows. 10 11 * Scripts/run-api-tests: Fix the PATH so that TestWebKitAPI can be 12 run on Windows. 13 (runTest): Added code to run TestWebKitAPI.exe on Windows and to die 14 on unsupported platforms. 15 (populateTests): Added code to run TestWebKitAPI.exe on Windows and to 16 die on other platforms. Extracted some formerly-Mac-specific code to 17 be cross-platform and made it handle any style of line-endings. 18 19 * TestWebKitAPI/Configurations/TestWebKitAPICFLite.vsprops: Added. 20 Links against CFLite. 21 22 * TestWebKitAPI/Configurations/TestWebKitAPICommon.vsprops: Added. 23 Contains most properties for the project. 24 25 * TestWebKitAPI/Configurations/TestWebKitAPICoreFoundation.vsprops: 26 Added. Links against CoreFoundation. 27 28 * TestWebKitAPI/TestWebKitAPIPrefix.h: Added a Windows-specific 29 section and moved the cross-platform section after the 30 platform-specific parts. 31 32 * TestWebKitAPI/win/PlatformUtilitiesWin.cpp: Added. 33 (TestWebKitAPI::Util::run): Runs a normal message pump until we're 34 done. 35 (TestWebKitAPI::Util::cf): Turns a UTF-8 C string into a CFString. 36 (TestWebKitAPI::Util::createURLForResource): Uses CFBundle to get the 37 resource path. 38 (TestWebKitAPI::Util::URLForNonExistentResource): Creates a bogus 39 WKURL. 40 41 * TestWebKitAPI/win/PlatformWebViewWin.cpp: Added. 42 (TestWebKitAPI::registerWindowClass): 43 (TestWebKitAPI::PlatformWebView::PlatformWebView): 44 (TestWebKitAPI::PlatformWebView::~PlatformWebView): 45 (TestWebKitAPI::PlatformWebView::page): 46 This was mostly copied from WebKitTestRunner's PlatformWebView. 47 48 * TestWebKitAPI/win/TestWebKitAPI.sln: Added. Builds both 49 TestWebKitAPI and TestWebKitAPIGeneratd. This is used by the 50 build-api-tests script. 51 52 * TestWebKitAPI/win/TestWebKitAPI.vcproj: Added. Builds 53 TestWebKitAPI.exe. 54 55 * TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj: Added. Just calls 56 through to copy-resources.cmd. 57 58 * TestWebKitAPI/win/copy-resources.cmd: Added. Copies resources into 59 or deletes resources from TestWebKitAPI.resources. 60 61 * TestWebKitAPI/win/main.cpp: Added. 62 (main): Calls through to TestsController. 63 1 64 2010-10-13 Gyuyoung Kim <gyuyoung.kim@samsung.com> 2 65 -
trunk/WebKitTools/Scripts/build-api-tests
r68910 r69656 62 62 if (isAppleMacWebKit()) { 63 63 $result = buildXCodeProject("TestWebKitAPI", $clean, XcodeOptions(), @ARGV); 64 } elsif (isAppleWinWebKit()) { 65 $result = buildVisualStudioProject("win/TestWebKitAPI.sln", $clean); 64 66 } else { 65 67 die "TestWebKitAPI is not supported on this platform.\n"; -
trunk/WebKitTools/Scripts/run-api-tests
r69317 r69656 71 71 setConfiguration(); 72 72 buildTestTool(); 73 setPathForRunningWebKitApp(\%ENV); 73 74 my %testsToRun = populateTests(); 74 75 … … 137 138 $result = system $apiTesterPath, $test, @ARGV; 138 139 } 140 } elsif (isAppleWinWebKit()) { 141 my $apiTesterNameSuffix; 142 if (configurationForVisualStudio() =~ /^Release|Debug_Internal$/) { 143 $apiTesterNameSuffix = ""; 144 } else { 145 $apiTesterNameSuffix = "_debug"; 146 } 147 my $apiTesterPath = File::Spec->catfile(productDir(), "TestWebKitAPI$apiTesterNameSuffix.exe"); 148 $result = system $apiTesterPath, $test, @ARGV; 149 } else { 150 die "run-api-tests is not supported on this platform.\n" 139 151 } 140 152 … … 149 161 sub populateTests() 150 162 { 163 my @tests; 164 151 165 if (isAppleMacWebKit()) { 152 166 my $productDir = productDir(); … … 162 176 } 163 177 close($childIn); 164 my@tests = <$childOut>;178 @tests = <$childOut>; 165 179 close($childOut); 166 180 … … 172 186 exit exitStatus($result); 173 187 } 174 175 chomp(@tests); 176 177 my %keyedTests = (); 178 for my $test (@tests) { 179 my ($suite, $testName) = split(/\//, $test); 180 push @{$keyedTests{$suite}}, $testName; 181 } 182 183 return %keyedTests; 184 } 188 } elsif (isAppleWinWebKit()) { 189 my $apiTesterNameSuffix; 190 if (configurationForVisualStudio() =~ /^Release|Debug_Internal$/) { 191 $apiTesterNameSuffix = ""; 192 } else { 193 $apiTesterNameSuffix = "_debug"; 194 } 195 my $apiTesterPath = File::Spec->catfile(productDir(), "TestWebKitAPI$apiTesterNameSuffix.exe"); 196 open(TESTS, "-|", $apiTesterPath, "--dump-tests") or die $!; 197 @tests = <TESTS>; 198 close(TESTS) or die $!; 199 } else { 200 die "run-api-tests is not supported on this platform.\n" 201 } 202 203 my %keyedTests = (); 204 for my $test (@tests) { 205 $test =~ s/[\r\n]*$//; 206 my ($suite, $testName) = split(/\//, $test); 207 push @{$keyedTests{$suite}}, $testName; 208 } 209 210 return %keyedTests; 185 211 } 186 212 -
trunk/WebKitTools/TestWebKitAPI/TestWebKitAPIPrefix.h
r68910 r69656 25 25 26 26 27 #include <stdint.h>28 29 #include <WebKit2/WebKit2.h>30 31 27 #if __APPLE__ 32 28 … … 35 31 #endif 36 32 33 #elif defined(WIN32) || defined(_WIN32) 34 35 #define NOMINMAX 36 37 37 #endif 38 39 #include <stdint.h> 40 41 #include <WebKit2/WebKit2.h> -
trunk/WebKitTools/TestWebKitAPI/win/main.cpp
r69650 r69656 24 24 */ 25 25 26 #include "TestsController.h" 26 27 27 #include <stdint.h> 28 int main(int argc, const char* argv[]) 29 { 30 bool passed = true; 28 31 29 #include <WebKit2/WebKit2.h> 32 std::string argument(argv[1]); 33 if (argument == "--dump-tests") 34 TestWebKitAPI::TestsController::shared().dumpTestNames(); 35 else 36 passed = TestWebKitAPI::TestsController::shared().runTestNamed(argument); 30 37 31 #if __APPLE__ 32 33 #ifdef __OBJC__ 34 #import <Cocoa/Cocoa.h> 35 #endif 36 37 #endif 38 return passed ? EXIT_SUCCESS : EXIT_FAILURE; 39 }
Note: See TracChangeset
for help on using the changeset viewer.
