Merge WebKitAPITest into TestWebKitAPI
authoraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 26 Sep 2011 12:16:59 +0000 (12:16 +0000)
committeraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 26 Sep 2011 12:16:59 +0000 (12:16 +0000)
commit3669254892dc71d198eb0ed129cacee9e906de23
tree7e2c29aa48f86ff4f45e757f4e63cfa4305161ac
parent0365508955daa69fbc64f3f48ef02b059e4ec36b
Merge WebKitAPITest into TestWebKitAPI

This also means that our formerly-WebKitAPITest tests will be run on the bots!

I made the minimal changes necessary to get the tests to run in TestWebKitAPI. I'll make
them more idiomatic in a separate pass.

Fixes <http://webkit.org/b/66560> WebKitAPITest and TestWebKitAPI have duplicate
functionality (and names!)

Reviewed by Anders Carlsson.

Tools:

* TestWebKitAPI/Tests/WebKit/win/WebViewDestruction.cpp: Renamed from Tools/WebKitAPITest/tests/WebViewDestruction.cpp.
* TestWebKitAPI/win/HostWindow.cpp: Renamed from Tools/WebKitAPITest/HostWindow.cpp.
* TestWebKitAPI/win/HostWindow.h: Renamed from Tools/WebKitAPITest/HostWindow.h.

* TestWebKitAPI/win/TestWebKitAPI.vcproj: Added new files.

* TestWebKitAPI/win/main.cpp:
(main): Added a call to ::OleInitialize to make WebKit1 work. This came from WebKitAPITest.

* WebKitAPITest: Removed this directory and its contents.

Source/WebKit/win:

Remove WebKitAPITest

* WebKit.vcproj/WebKit.sln: Removed WebKitAPITest.vcproj. Changed WebKitLauncherWin, which
formerly depended on WebKitAPITest, to now depend on DumpRenderTree, which WebKitAPITest
depended on.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@95944 268f45cc-cd09-0410-ab3c-d52691b4dbfc
23 files changed:
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebKit.vcproj/WebKit.sln
Tools/ChangeLog
Tools/TestWebKitAPI/Tests/WebKit/win/WebViewDestruction.cpp [moved from Tools/WebKitAPITest/tests/WebViewDestruction.cpp with 99% similarity]
Tools/TestWebKitAPI/win/HostWindow.cpp [moved from Tools/WebKitAPITest/HostWindow.cpp with 100% similarity]
Tools/TestWebKitAPI/win/HostWindow.h [moved from Tools/WebKitAPITest/HostWindow.h with 100% similarity]
Tools/TestWebKitAPI/win/TestWebKitAPI.vcproj
Tools/TestWebKitAPI/win/main.cpp
Tools/WebKitAPITest/Test.h [deleted file]
Tools/WebKitAPITest/TestsController.cpp [deleted file]
Tools/WebKitAPITest/TestsController.h [deleted file]
Tools/WebKitAPITest/WebKitAPITest.vcproj [deleted file]
Tools/WebKitAPITest/WebKitAPITestCommon.vsprops [deleted file]
Tools/WebKitAPITest/WebKitAPITestDebug.vsprops [deleted file]
Tools/WebKitAPITest/WebKitAPITestDebugAll.vsprops [deleted file]
Tools/WebKitAPITest/WebKitAPITestDebugCairoCFLite.vsprops [deleted file]
Tools/WebKitAPITest/WebKitAPITestPostBuild.cmd [deleted file]
Tools/WebKitAPITest/WebKitAPITestPreBuild.cmd [deleted file]
Tools/WebKitAPITest/WebKitAPITestProduction.vsprops [deleted file]
Tools/WebKitAPITest/WebKitAPITestRelease.vsprops [deleted file]
Tools/WebKitAPITest/WebKitAPITestReleaseCairoCFLite.vsprops [deleted file]
Tools/WebKitAPITest/config.h [deleted file]
Tools/WebKitAPITest/main.cpp [deleted file]