Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[mac-sierra] 2 WKWebViewCandidateTests API test failures
https://bugs.webkit.org/show_bug.cgi?id=162470

Reviewed by Tim Horton.

VideoControlsManager, WKWebViewCandidateTests and CandidateTests should not be running on 10.12.0. Guard these
tests with an SDK check to prevent 10.12.0 bots from building them.

* TestWebKitAPI/Tests/WebKit2Cocoa/VideoControlsManager.mm:
* TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewCandidateTests.mm:
* TestWebKitAPI/Tests/mac/CandidateTests.mm:


Canonical link: https://commits.webkit.org/180464@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@206335 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
whsieh committed Sep 23, 2016
1 parent d265d37 commit 92ccfdd
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 6 deletions.
14 changes: 14 additions & 0 deletions Tools/ChangeLog
@@ -1,3 +1,17 @@
2016-09-23 Wenson Hsieh <wenson_hsieh@apple.com>

[mac-sierra] 2 WKWebViewCandidateTests API test failures
https://bugs.webkit.org/show_bug.cgi?id=162470

Reviewed by Tim Horton.

VideoControlsManager, WKWebViewCandidateTests and CandidateTests should not be running on 10.12.0. Guard these
tests with an SDK check to prevent 10.12.0 bots from building them.

* TestWebKitAPI/Tests/WebKit2Cocoa/VideoControlsManager.mm:
* TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewCandidateTests.mm:
* TestWebKitAPI/Tests/mac/CandidateTests.mm:

2016-09-23 Alex Christensen <achristensen@webkit.org>

Refactor URLParser
Expand Down
Expand Up @@ -32,7 +32,7 @@
#import <WebKit/WKWebViewPrivate.h>
#import <wtf/RetainPtr.h>

#if WK_API_ENABLED && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
#if WK_API_ENABLED && PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101201

@interface WKWebView (WKWebViewAdditions)

Expand Down Expand Up @@ -412,4 +412,4 @@ - (void)_handleControlledElementIDResponse:(NSString *)identifier

} // namespace TestWebKitAPI

#endif // WK_API_ENABLED && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
#endif // WK_API_ENABLED && PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101201
Expand Up @@ -25,7 +25,7 @@

#import "config.h"

#if WK_API_ENABLED && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
#if WK_API_ENABLED && PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101201

#import "PlatformUtilities.h"
#import "TestWKWebViewMac.h"
Expand Down Expand Up @@ -243,4 +243,4 @@ + (instancetype)setUpWithFrame:(NSRect)frame testPage:(NSString *)testPageName

#endif

#endif /* WK_API_ENABLED && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 */
#endif /* WK_API_ENABLED && PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101201 */
4 changes: 2 additions & 2 deletions Tools/TestWebKitAPI/Tests/mac/CandidateTests.mm
Expand Up @@ -29,7 +29,7 @@
#import <WebKit/WebViewPrivate.h>
#import <wtf/RetainPtr.h>

#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101201

static bool webViewWasDeallocated = false;
static bool didFinishLoad = false;
Expand Down Expand Up @@ -145,4 +145,4 @@ - (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame

}

#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101201

0 comments on commit 92ccfdd

Please sign in to comment.