Changeset 219489 in webkit


Ignore:
Timestamp:
Jul 13, 2017, 7:29:31 PM (8 years ago)
Author:
matthew_hanson@apple.com
Message:

Fix TestWebKit API.
​https://bugs.webkit.org/show_bug.cgi?id=174164
rdar://problem/33137595

Reviewed by Dan Bernstein.

  • TestWebKitAPI/CMakeLists.txt:
  • TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
  • TestWebKitAPI/PlatformGTK.cmake:
Location:
trunk/Tools
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/Tools/ChangeLog

    r219486 r219489  
     12017-07-13  Matthew Hanson  <matthew_hanson@apple.com>
     2
     3        Fix TestWebKit API.
     4        https://bugs.webkit.org/show_bug.cgi?id=174164
     5        rdar://problem/33137595
     6
     7        Reviewed by Dan Bernstein.
     8
     9        * TestWebKitAPI/CMakeLists.txt:
     10        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
     11        * TestWebKitAPI/PlatformGTK.cmake:
     12
    1132017-07-13  Matthew Hanson  <matthew_hanson@apple.com>
    214

  • TabularUnified trunk/Tools/TestWebKitAPI/CMakeLists.txt

    r219260 r219489  
    2020        TestWebKitAPIBase
    2121        WTF
    22         WebKit2
     22        WebKit
    2323        gtest
    2424    )
    2525    list(APPEND TestWebKitAPI_LIBRARIES
    26         WebKit2
     26        WebKitLegacy
    2727    )
    2828else ()
    2929    list(APPEND TestWebKitAPI_LIBRARIES
    30         WebKit${DEBUG_SUFFIX}
     30        WebKitLegacy${DEBUG_SUFFIX}
    3131    )
    3232endif ()
    … …  
    120120        ${TESTWEBKITAPI_DIR}/InjectedBundleMain.cpp
    121121        ${TESTWEBKITAPI_DIR}/PlatformUtilities.cpp
    122         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/CanHandleRequest_Bundle.cpp
    123         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp
    124         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/DOMWindowExtensionBasic_Bundle.cpp
    125         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/DOMWindowExtensionNoCache_Bundle.cpp
    126         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/DocumentStartUserScriptAlertCrash_Bundle.cpp
    127         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback_Bundle.cpp
    128         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp
    129         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/InjectedBundleBasic_Bundle.cpp
    130         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/InjectedBundleFrameHitTest_Bundle.cpp
    131         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins_Bundle.cpp
    132         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp
    133         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/MouseMoveAfterCrash_Bundle.cpp
    134         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails_Bundle.cpp
    135         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages_Bundle.cpp
    136         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames_Bundle.cpp
    137         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout_Bundle.cpp
    138         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ParentFrame_Bundle.cpp
    139         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ProvisionalURLAfterWillSendRequestCallback_Bundle.cpp
    140         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly_Bundle.cpp
    141         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ShouldGoToBackForwardListItem_Bundle.cpp
    142         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/TextFieldDidBeginAndEndEditing_Bundle.cpp
    143         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/UserMessage_Bundle.cpp
    144         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WillLoad_Bundle.cpp
    145         ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp
     122        ${TESTWEBKITAPI_DIR}/Tests/WebKit/CanHandleRequest_Bundle.cpp
     123        ${TESTWEBKITAPI_DIR}/Tests/WebKit/DidAssociateFormControls_Bundle.cpp
     124        ${TESTWEBKITAPI_DIR}/Tests/WebKit/DOMWindowExtensionBasic_Bundle.cpp
     125        ${TESTWEBKITAPI_DIR}/Tests/WebKit/DOMWindowExtensionNoCache_Bundle.cpp
     126        ${TESTWEBKITAPI_DIR}/Tests/WebKit/DocumentStartUserScriptAlertCrash_Bundle.cpp
     127        ${TESTWEBKITAPI_DIR}/Tests/WebKit/GetInjectedBundleInitializationUserDataCallback_Bundle.cpp
     128        ${TESTWEBKITAPI_DIR}/Tests/WebKit/HitTestResultNodeHandle_Bundle.cpp
     129        ${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleBasic_Bundle.cpp
     130        ${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleFrameHitTest_Bundle.cpp
     131        ${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleInitializationUserDataCallbackWins_Bundle.cpp
     132        ${TESTWEBKITAPI_DIR}/Tests/WebKit/LoadCanceledNoServerRedirectCallback_Bundle.cpp
     133        ${TESTWEBKITAPI_DIR}/Tests/WebKit/MouseMoveAfterCrash_Bundle.cpp
     134        ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails_Bundle.cpp
     135        ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutForImages_Bundle.cpp
     136        ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFrames_Bundle.cpp
     137        ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayout_Bundle.cpp
     138        ${TESTWEBKITAPI_DIR}/Tests/WebKit/ParentFrame_Bundle.cpp
     139        ${TESTWEBKITAPI_DIR}/Tests/WebKit/ProvisionalURLAfterWillSendRequestCallback_Bundle.cpp
     140        ${TESTWEBKITAPI_DIR}/Tests/WebKit/ResponsivenessTimerDoesntFireEarly_Bundle.cpp
     141        ${TESTWEBKITAPI_DIR}/Tests/WebKit/ShouldGoToBackForwardListItem_Bundle.cpp
     142        ${TESTWEBKITAPI_DIR}/Tests/WebKit/TextFieldDidBeginAndEndEditing_Bundle.cpp
     143        ${TESTWEBKITAPI_DIR}/Tests/WebKit/UserMessage_Bundle.cpp
     144        ${TESTWEBKITAPI_DIR}/Tests/WebKit/WillLoad_Bundle.cpp
     145        ${TESTWEBKITAPI_DIR}/Tests/WebKit/WillSendSubmitEvent_Bundle.cpp
    146146    )
    147147
    … …  
    159159
    160160add_definitions(-DGTEST_HAS_RTTI=0
    161     -DTEST_WEBKIT2_RESOURCES_DIR=\"${TESTWEBKITAPI_DIR}/Tests/WebKit2\"
     161    -DTEST_WEBKIT2_RESOURCES_DIR=\"${TESTWEBKITAPI_DIR}/Tests/WebKit\"
    162162    -DTEST_INJECTED_BUNDLE_PATH=\"${TestWebKitAPIInjectedBundle_PATH}\"
    163163)
    … …  
    206206    )
    207207
    208     target_link_libraries(TestWebKitAPIBase JavaScriptCore WTF WebKit2 gtest)
    209 
    210     add_dependencies(TestWebKitAPIBase WebKit2 ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
     208    target_link_libraries(TestWebKitAPIBase JavaScriptCore WTF WebKit gtest)
     209
     210    add_dependencies(TestWebKitAPIBase WebKit ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
    211211
    212212    foreach (testName ${test_webkit2_api_BINARIES})
    213213        get_filename_component(testBaseName ${testName} NAME)
    214         add_executable(${testBaseName} ${TESTWEBKITAPI_DIR}/Tests/WebKit2/${testName}.cpp)
    215         add_test(${testBaseName} ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit2/${testBaseName})
     214        add_executable(${testBaseName} ${TESTWEBKITAPI_DIR}/Tests/WebKit/${testName}.cpp)
     215        add_test(${testBaseName} ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit/${testBaseName})
    216216        set_tests_properties(${testBaseName} PROPERTIES TIMEOUT 60)
    217217        target_link_libraries(${testBaseName} ${test_webkit2_api_LIBRARIES})
    218218        set_target_properties(${testBaseName} PROPERTIES
    219             RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit2
     219            RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit
    220220        )
    221221    endforeach ()
    … …  
    225225    # make the bot red.
    226226    foreach (testName ${test_webkit2_api_fail_BINARIES})
    227         add_executable(${testName} ${TESTWEBKITAPI_DIR}/Tests/WebKit2/${testName}.cpp)
     227        add_executable(${testName} ${TESTWEBKITAPI_DIR}/Tests/WebKit/${testName}.cpp)
    228228        target_link_libraries(${testName} ${test_webkit2_api_LIBRARIES})
    229229        set_target_properties(${testName} PROPERTIES
    230             RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit2/failure
     230            RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit/failure
    231231        )
    232232    endforeach ()

  • TabularUnified trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig

    r219403 r219489  
    2424
    2525// The contents of this file must be kept in sync with FeatureDefines.xcconfig in JavaScriptCore,
    26 // WebCore, WebKit and WebKit2.  Also the default values of the ENABLE_FEATURE_NAME macros in
     26// WebCore, WebKitLegacy and WebKit.  Also the default values of the ENABLE_FEATURE_NAME macros in
    2727// build-webkit should match the values below, but they do not need to be in the same order.
    2828

  • TabularUnified trunk/Tools/TestWebKitAPI/PlatformGTK.cmake

    r211836 r219489  
    7070
    7171add_executable(TestWebKit2
    72     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/AboutBlankLoad.cpp
    73     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/CanHandleRequest.cpp
    74     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/CookieManager.cpp
    75     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp
    76     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/DOMWindowExtensionBasic.cpp
    77     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/DOMWindowExtensionNoCache.cpp
    78     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/DownloadDecideDestinationCrash.cpp
    79     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/EnumerateMediaDevices.cpp
    80     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/EvaluateJavaScript.cpp
    81     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/FailedLoad.cpp
    82     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/Find.cpp
    83     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ForceRepaint.cpp
    84     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/FrameMIMETypeHTML.cpp
    85     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/FrameMIMETypePNG.cpp
    86     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/Geolocation.cpp
    87     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback.cpp
    88     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/HitTestResultNodeHandle.cpp
    89     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/InjectedBundleBasic.cpp
    90     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/InjectedBundleFrameHitTest.cpp
    91     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins.cpp
    92     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/LoadAlternateHTMLStringWithNonDirectoryURL.cpp
    93     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/LoadCanceledNoServerRedirectCallback.cpp
    94     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/LoadPageOnCrash.cpp
    95     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/MouseMoveAfterCrash.cpp
    96     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout.cpp
    97     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails.cpp
    98     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages.cpp
    99     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp
    100     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/PageLoadBasic.cpp
    101     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp
    102     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ParentFrame.cpp
    103     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/PendingAPIRequestURL.cpp
    104     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/PreventEmptyUserAgent.cpp
    105     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback.cpp
    106     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ProvisionalURLAfterWillSendRequestCallback.cpp
    107     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ReloadPageAfterCrash.cpp
    108     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ResizeWindowAfterCrash.cpp
    109     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp
    110     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/ShouldGoToBackForwardListItem.cpp
    111     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/TextFieldDidBeginAndEndEditing.cpp
    112     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/UserMedia.cpp
    113     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/UserMessage.cpp
    114     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WillSendSubmitEvent.cpp
    115     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKPageCopySessionStateWithFiltering.cpp
    116     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKPageGetScaleFactorNotZero.cpp
    117     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKPreferences.cpp
    118     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKRetainPtr.cpp
    119     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKString.cpp
    120     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKStringJSString.cpp
    121     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKURL.cpp
    122     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/gtk/InputMethodFilter.cpp
     72    ${TESTWEBKITAPI_DIR}/Tests/WebKit/AboutBlankLoad.cpp
     73    ${TESTWEBKITAPI_DIR}/Tests/WebKit/CanHandleRequest.cpp
     74    ${TESTWEBKITAPI_DIR}/Tests/WebKit/CookieManager.cpp
     75    ${TESTWEBKITAPI_DIR}/Tests/WebKit/DocumentStartUserScriptAlertCrash.cpp
     76    ${TESTWEBKITAPI_DIR}/Tests/WebKit/DOMWindowExtensionBasic.cpp
     77    ${TESTWEBKITAPI_DIR}/Tests/WebKit/DOMWindowExtensionNoCache.cpp
     78    ${TESTWEBKITAPI_DIR}/Tests/WebKit/DownloadDecideDestinationCrash.cpp
     79    ${TESTWEBKITAPI_DIR}/Tests/WebKit/EnumerateMediaDevices.cpp
     80    ${TESTWEBKITAPI_DIR}/Tests/WebKit/EvaluateJavaScript.cpp
     81    ${TESTWEBKITAPI_DIR}/Tests/WebKit/FailedLoad.cpp
     82    ${TESTWEBKITAPI_DIR}/Tests/WebKit/Find.cpp
     83    ${TESTWEBKITAPI_DIR}/Tests/WebKit/ForceRepaint.cpp
     84    ${TESTWEBKITAPI_DIR}/Tests/WebKit/FrameMIMETypeHTML.cpp
     85    ${TESTWEBKITAPI_DIR}/Tests/WebKit/FrameMIMETypePNG.cpp
     86    ${TESTWEBKITAPI_DIR}/Tests/WebKit/Geolocation.cpp
     87    ${TESTWEBKITAPI_DIR}/Tests/WebKit/GetInjectedBundleInitializationUserDataCallback.cpp
     88    ${TESTWEBKITAPI_DIR}/Tests/WebKit/HitTestResultNodeHandle.cpp
     89    ${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleBasic.cpp
     90    ${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleFrameHitTest.cpp
     91    ${TESTWEBKITAPI_DIR}/Tests/WebKit/InjectedBundleInitializationUserDataCallbackWins.cpp
     92    ${TESTWEBKITAPI_DIR}/Tests/WebKit/LoadAlternateHTMLStringWithNonDirectoryURL.cpp
     93    ${TESTWEBKITAPI_DIR}/Tests/WebKit/LoadCanceledNoServerRedirectCallback.cpp
     94    ${TESTWEBKITAPI_DIR}/Tests/WebKit/LoadPageOnCrash.cpp
     95    ${TESTWEBKITAPI_DIR}/Tests/WebKit/MouseMoveAfterCrash.cpp
     96    ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayout.cpp
     97    ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFails.cpp
     98    ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutForImages.cpp
     99    ${TESTWEBKITAPI_DIR}/Tests/WebKit/NewFirstVisuallyNonEmptyLayoutFrames.cpp
     100    ${TESTWEBKITAPI_DIR}/Tests/WebKit/PageLoadBasic.cpp
     101    ${TESTWEBKITAPI_DIR}/Tests/WebKit/PageLoadDidChangeLocationWithinPageForFrame.cpp
     102    ${TESTWEBKITAPI_DIR}/Tests/WebKit/ParentFrame.cpp
     103    ${TESTWEBKITAPI_DIR}/Tests/WebKit/PendingAPIRequestURL.cpp
     104    ${TESTWEBKITAPI_DIR}/Tests/WebKit/PreventEmptyUserAgent.cpp
     105    ${TESTWEBKITAPI_DIR}/Tests/WebKit/PrivateBrowsingPushStateNoHistoryCallback.cpp
     106    ${TESTWEBKITAPI_DIR}/Tests/WebKit/ProvisionalURLAfterWillSendRequestCallback.cpp
     107    ${TESTWEBKITAPI_DIR}/Tests/WebKit/ReloadPageAfterCrash.cpp
     108    ${TESTWEBKITAPI_DIR}/Tests/WebKit/ResizeWindowAfterCrash.cpp
     109    ${TESTWEBKITAPI_DIR}/Tests/WebKit/RestoreSessionStateContainingFormData.cpp
     110    ${TESTWEBKITAPI_DIR}/Tests/WebKit/ShouldGoToBackForwardListItem.cpp
     111    ${TESTWEBKITAPI_DIR}/Tests/WebKit/TextFieldDidBeginAndEndEditing.cpp
     112    ${TESTWEBKITAPI_DIR}/Tests/WebKit/UserMedia.cpp
     113    ${TESTWEBKITAPI_DIR}/Tests/WebKit/UserMessage.cpp
     114    ${TESTWEBKITAPI_DIR}/Tests/WebKit/WillSendSubmitEvent.cpp
     115    ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKPageCopySessionStateWithFiltering.cpp
     116    ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKPageGetScaleFactorNotZero.cpp
     117    ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKPreferences.cpp
     118    ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKRetainPtr.cpp
     119    ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKString.cpp
     120    ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKStringJSString.cpp
     121    ${TESTWEBKITAPI_DIR}/Tests/WebKit/WKURL.cpp
     122    ${TESTWEBKITAPI_DIR}/Tests/WebKit/gtk/InputMethodFilter.cpp
    123123)
    124124
    125125target_link_libraries(TestWebKit2 ${test_webkit2_api_LIBRARIES})
    126 add_test(TestWebKit2 ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit2/TestWebKit2)
     126add_test(TestWebKit2 ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit/TestWebKit2)
    127127set_tests_properties(TestWebKit2 PROPERTIES TIMEOUT 60)
    128 set_target_properties(TestWebKit2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit2)
     128set_target_properties(TestWebKit2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebKit)
    129129
    130130add_executable(TestWebCore
Note: See TracChangeset for help on using the changeset viewer.