Changeset 86624 in webkit


Ignore:
Timestamp:
May 16, 2011 3:57:43 PM (13 years ago)
Author:
weinig@apple.com
Message:

2011-05-16 Sam Weinig <​sam@webkit.org>

Reviewed by Anders Carlsson.

TestWebKitAPI should build with clang if it can
​https://bugs.webkit.org/show_bug.cgi?id=60918

  • TestWebKitAPI/Configurations/CompilerVersion.xcconfig: Update CompilerVersion.xcconfig to match others.
  • TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: Add CompilerVersion.xcconfig to the project.
  • TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp: (TestWebKitAPI::didFailProvisionalLoadWithErrorForFrame):
  • TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp: (TestWebKitAPI::didSameDocumentNavigationForFrame): Add some casts to quiet warnings from clang.
Location:
trunk/Tools
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r86616 r86624  
     12011-05-16  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Anders Carlsson.
     4
     5        TestWebKitAPI should build with clang if it can
     6        https://bugs.webkit.org/show_bug.cgi?id=60918
     7
     8        * TestWebKitAPI/Configurations/CompilerVersion.xcconfig:
     9        Update CompilerVersion.xcconfig to match others.
     10
     11        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
     12        Add CompilerVersion.xcconfig to the project.
     13
     14        * TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp:
     15        (TestWebKitAPI::didFailProvisionalLoadWithErrorForFrame):
     16        * TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp:
     17        (TestWebKitAPI::didSameDocumentNavigationForFrame):
     18        Add some casts to quiet warnings from clang.
     19
    1202011-05-16  Dirk Pranke  <dpranke@chromium.org>
    221

  • trunk/Tools/TestWebKitAPI/Configurations/CompilerVersion.xcconfig

    r85037 r86624  
    3030// XCODE_VERSION_ACTUAL for the full version number.
    3131TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(REAL_PLATFORM_NAME));
    32 TARGET_GCC_VERSION_iphoneos = LLVM_GCC_42;
    33 TARGET_GCC_VERSION_iphonesimulator = GCC_42;
    34 TARGET_GCC_VERSION_macosx = $(TARGET_GCC_VERSION_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     32TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    3533
    36 TARGET_GCC_VERSION_macosx_1050 = $(TARGET_GCC_VERSION_macosx_1050_$(XCODE_VERSION_MINOR));
    37 TARGET_GCC_VERSION_macosx_1050_ = $(TARGET_GCC_VERSION_macosx_1050_$(XCODE_VERSION_ACTUAL));
    38 TARGET_GCC_VERSION_macosx_1050_0310 = GCC_42;
    39 TARGET_GCC_VERSION_macosx_1050_0320 = GCC_42;
     34TARGET_GCC_VERSION_1050 = $(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_MINOR));
     35TARGET_GCC_VERSION_1050_ = $(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_ACTUAL));
     36TARGET_GCC_VERSION_1050_0310 = GCC_42;
     37TARGET_GCC_VERSION_1050_0320 = GCC_42;
    4038
    41 TARGET_GCC_VERSION_macosx_1060 = $(TARGET_GCC_VERSION_macosx_1060_$(CONFIGURATION));
    42 TARGET_GCC_VERSION_macosx_1060_Debug = $(TARGET_GCC_VERSION_macosx_1060_Debug_$(XCODE_VERSION_MAJOR));
    43 TARGET_GCC_VERSION_macosx_1060_Debug_0300 = GCC_42;
    44 TARGET_GCC_VERSION_macosx_1060_Debug_0400 = $(TARGET_GCC_VERSION_macosx_1060_Debug_0400_$(IS_XCODE_0400));
    45 TARGET_GCC_VERSION_macosx_1060_Debug_0400_ = LLVM_COMPILER;
    46 TARGET_GCC_VERSION_macosx_1060_Debug_0400_1 = GCC_42;
    47 TARGET_GCC_VERSION_macosx_1060_Release = GCC_42;
    48 TARGET_GCC_VERSION_macosx_1060_Production = GCC_42;
     39TARGET_GCC_VERSION_1060 = $(TARGET_GCC_VERSION_1060_$(CONFIGURATION));
     40TARGET_GCC_VERSION_1060_Debug = $(TARGET_GCC_VERSION_1060_Debug_$(XCODE_VERSION_MAJOR));
     41TARGET_GCC_VERSION_1060_Debug_0300 = GCC_42;
     42TARGET_GCC_VERSION_1060_Debug_0400 = $(TARGET_GCC_VERSION_1060_Debug_0400_$(IS_XCODE_0400));
     43TARGET_GCC_VERSION_1060_Debug_0400_ = LLVM_COMPILER;
     44TARGET_GCC_VERSION_1060_Debug_0400_1 = GCC_42;
     45TARGET_GCC_VERSION_1060_Release = GCC_42;
     46TARGET_GCC_VERSION_1060_Production = GCC_42;
    4947
    50 TARGET_GCC_VERSION_macosx_1070 = $(TARGET_GCC_VERSION_macosx_1070_$(CONFIGURATION));
    51 TARGET_GCC_VERSION_macosx_1070_Debug = LLVM_COMPILER;
    52 TARGET_GCC_VERSION_macosx_1070_Release = LLVM_GCC_42;
    53 TARGET_GCC_VERSION_macosx_1070_Production = LLVM_GCC_42;
     48TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_$(CONFIGURATION));
     49TARGET_GCC_VERSION_1070_Debug = LLVM_COMPILER;
     50TARGET_GCC_VERSION_1070_Release = LLVM_GCC_42;
     51TARGET_GCC_VERSION_1070_Production = LLVM_GCC_42;
    5452
    5553GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));

  • trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

    r86511 r86624  
    160160                BCBD3760125ABCFE00D2C29F /* FrameMIMETypePNG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameMIMETypePNG.cpp; sourceTree = "<group>"; };
    161161                BCC8B95A12611F4700DE46A4 /* FailedLoad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FailedLoad.cpp; sourceTree = "<group>"; };
     162                BCF0F9391381C25B008361AC /* CompilerVersion.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = CompilerVersion.xcconfig; sourceTree = "<group>"; };
    162163                C02B77F1126612140026BF0F /* SpacebarScrolling.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpacebarScrolling.cpp; sourceTree = "<group>"; };
    163164                C02B7853126613AE0026BF0F /* Carbon.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = Carbon.framework; sourceTree = SDKROOT; };
    … …  
    266267                        children = (
    267268                                BC90957E12554CF900083756 /* Base.xcconfig */,
     269                                BCF0F9391381C25B008361AC /* CompilerVersion.xcconfig */,
    268270                                BC90957F12554CF900083756 /* DebugRelease.xcconfig */,
    269271                                BC575AE2126E88B1006F0F12 /* InjectedBundle.xcconfig */,

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp

    r86602 r86624  
    3939static void didFailProvisionalLoadWithErrorForFrame(WKPageRef page, WKFrameRef frame, WKErrorRef error, WKTypeRef userData, const void* clientInfo)
    4040{
    41     EXPECT_EQ(kWKFrameLoadStateFinished, WKFrameGetFrameLoadState(frame));
     41    EXPECT_EQ(static_cast<uint32_t>(kWKFrameLoadStateFinished), WKFrameGetFrameLoadState(frame));
    4242
    4343    WKURLRef url = WKFrameCopyProvisionalURL(frame);

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp

    r86602 r86624  
    4848{
    4949    if (!didPopStateWithinPage) {
    50         EXPECT_EQ(type, kWKSameDocumentNavigationSessionStatePop);
     50        EXPECT_EQ(static_cast<uint32_t>(kWKSameDocumentNavigationSessionStatePop), type);
    5151        EXPECT_FALSE(didChangeLocationWithinPage);
    5252        didPopStateWithinPage = true;
    … …  
    5454    }
    5555
    56     EXPECT_EQ(kWKSameDocumentNavigationAnchorNavigation, type);
     56    EXPECT_EQ(static_cast<uint32_t>(kWKSameDocumentNavigationAnchorNavigation), type);
    5757    didChangeLocationWithinPage = true;
    5858}
Note: See TracChangeset for help on using the changeset viewer.