Changeset 95944 in webkit


Ignore:
Timestamp:
Sep 26, 2011 5:16:59 AM (13 years ago)
Author:
Adam Roben
Message:

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.

Location:
trunk
Files:
2 added
1 deleted
5 edited
3 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/win/ChangeLog

    r95919 r95944  
     12011-09-23  Adam Roben  <aroben@apple.com>
     2
     3        Remove WebKitAPITest
     4
     5        WebKit part of <http://webkit.org/b/66560> WebKitAPITest and TestWebKitAPI have duplicate
     6        functionality (and names!)
     7
     8        Reviewed by Anders Carlsson.
     9
     10        * WebKit.vcproj/WebKit.sln: Removed WebKitAPITest.vcproj. Changed WebKitLauncherWin, which
     11        formerly depended on WebKitAPITest, to now depend on DumpRenderTree, which WebKitAPITest
     12        depended on.
     13
    1142011-09-24  Adam Barth  <abarth@webkit.org>
    215

  • trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln

    r95734 r95944  
    9999        EndProjectSection
    100100EndProject
    101 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKitAPITest", "..\..\..\..\Tools\WebKitAPITest\WebKitAPITest.vcproj", "{626089A3-25D3-4883-A96C-B8C66E036397}"
     101Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKitLauncherWin", "..\..\..\..\Tools\WebKitLauncherWin\WebKitLauncherWin.vcproj", "{D09806DB-E58B-4646-8C9B-61101906C1E2}"
    102102        ProjectSection(ProjectDependencies) = postProject
    103103                {6567DFD4-D6DE-4CD5-825D-17E353D160E1} = {6567DFD4-D6DE-4CD5-825D-17E353D160E1}
    104         EndProjectSection
    105 EndProject
    106 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKitLauncherWin", "..\..\..\..\Tools\WebKitLauncherWin\WebKitLauncherWin.vcproj", "{D09806DB-E58B-4646-8C9B-61101906C1E2}"
    107         ProjectSection(ProjectDependencies) = postProject
    108                 {626089A3-25D3-4883-A96C-B8C66E036397} = {626089A3-25D3-4883-A96C-B8C66E036397}
    109104        EndProjectSection
    110105EndProject
    … …  
    388383                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.ActiveCfg = Release|Win32
    389384                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.Build.0 = Release|Win32
    390                 {626089A3-25D3-4883-A96C-B8C66E036397}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
    391                 {626089A3-25D3-4883-A96C-B8C66E036397}.Debug_All|Win32.Build.0 = Debug_All|Win32
    392                 {626089A3-25D3-4883-A96C-B8C66E036397}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32
    393                 {626089A3-25D3-4883-A96C-B8C66E036397}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32
    394                 {626089A3-25D3-4883-A96C-B8C66E036397}.Debug|Win32.ActiveCfg = Debug|Win32
    395                 {626089A3-25D3-4883-A96C-B8C66E036397}.Debug|Win32.Build.0 = Debug|Win32
    396                 {626089A3-25D3-4883-A96C-B8C66E036397}.Production|Win32.ActiveCfg = Production|Win32
    397                 {626089A3-25D3-4883-A96C-B8C66E036397}.Production|Win32.Build.0 = Production|Win32
    398                 {626089A3-25D3-4883-A96C-B8C66E036397}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
    399                 {626089A3-25D3-4883-A96C-B8C66E036397}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
    400                 {626089A3-25D3-4883-A96C-B8C66E036397}.Release|Win32.ActiveCfg = Release|Win32
    401                 {626089A3-25D3-4883-A96C-B8C66E036397}.Release|Win32.Build.0 = Release|Win32
    402385                {D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
    403386                {D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug_All|Win32.Build.0 = Debug_All|Win32
    … …  
    569552                {44B9C152-1870-4035-B94D-7B3285AA0C12} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
    570553                {C0737398-3565-439E-A2B8-AB2BE4D5430C} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
    571                 {626089A3-25D3-4883-A96C-B8C66E036397} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
    572554                {D09806DB-E58B-4646-8C9B-61101906C1E2} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
    573555                {114FCA11-216B-4C8C-957E-30A75AE80443} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}

  • trunk/Tools/ChangeLog

    r95943 r95944  
     12011-09-23  Adam Roben  <aroben@apple.com>
     2
     3        Merge WebKitAPITest into TestWebKitAPI
     4
     5        This also means that our formerly-WebKitAPITest tests will be run on the bots!
     6
     7        I made the minimal changes necessary to get the tests to run in TestWebKitAPI. I'll make
     8        them more idiomatic in a separate pass.
     9
     10        Fixes <http://webkit.org/b/66560> WebKitAPITest and TestWebKitAPI have duplicate
     11        functionality (and names!)
     12
     13        Reviewed by Anders Carlsson.
     14
     15        * TestWebKitAPI/Tests/WebKit/win/WebViewDestruction.cpp: Renamed from Tools/WebKitAPITest/tests/WebViewDestruction.cpp.
     16        * TestWebKitAPI/win/HostWindow.cpp: Renamed from Tools/WebKitAPITest/HostWindow.cpp.
     17        * TestWebKitAPI/win/HostWindow.h: Renamed from Tools/WebKitAPITest/HostWindow.h.
     18
     19        * TestWebKitAPI/win/TestWebKitAPI.vcproj: Added new files.
     20
     21        * TestWebKitAPI/win/main.cpp:
     22        (main): Added a call to ::OleInitialize to make WebKit1 work. This came from WebKitAPITest.
     23
     24        * WebKitAPITest: Removed this directory and its contents.
     25
    1262011-09-23  Adam Roben  <aroben@apple.com>
    227

  • trunk/Tools/TestWebKitAPI/Tests/WebKit/win/WebViewDestruction.cpp

    • Property svn:eol-style set to native
    r95943 r95944  
    3232#include <wtf/PassOwnPtr.h>
    3333
     34#define TEST_ASSERT(x) ASSERT_TRUE(x)
     35
    3436namespace WebKitAPITest {
    3537

  • trunk/Tools/TestWebKitAPI/win/HostWindow.cpp

    • Property svn:eol-style set to native

  • trunk/Tools/TestWebKitAPI/win/HostWindow.h

    • Property svn:eol-style set to native

  • trunk/Tools/TestWebKitAPI/win/TestWebKitAPI.vcproj

    r95440 r95944  
    389389                        Name="win"
    390390                        >
     391                        <File
     392                                RelativePath=".\HostWindow.cpp"
     393                                >
     394                        </File>
     395                        <File
     396                                RelativePath=".\HostWindow.h"
     397                                >
     398                        </File>
    391399                        <File
    392400                                RelativePath=".\InjectedBundleControllerWin.cpp"
    … …  
    629637                                </File>
    630638                        </Filter>
     639                        <Filter
     640                                Name="WebKit"
     641                                >
     642                                <Filter
     643                                        Name="win"
     644                                        >
     645                                        <File
     646                                                RelativePath="..\Tests\WebKit\win\WebViewDestruction.cpp"
     647                                                >
     648                                        </File>
     649                                </Filter>
     650                        </Filter>
    631651                </Filter>
    632652                <File
     653                        RelativePath="..\config.h"
     654                        >
     655                </File>
     656                <File
    633657                        RelativePath="..\JavaScriptTest.cpp"
    634658                        >
    … …  
    660684                <File
    661685                        RelativePath="..\TestsController.h"
    662                         >
    663                 </File>
    664                 <File
    665                         RelativePath="..\config.h"
    666686                        >
    667687                </File>

  • trunk/Tools/TestWebKitAPI/win/main.cpp

    r95188 r95944  
    3434    ::SetErrorMode(0);
    3535
     36    // Initialize COM, needed for WebKit1 tests.
     37    // FIXME: Remove this line once <http://webkit.org/b/32867> is fixed.
     38    ::OleInitialize(0);
     39
    3640    bool passed = TestWebKitAPI::TestsController::shared().run(argc, argv);
    3741
Note: See TracChangeset for help on using the changeset viewer.