Changeset 225870 in webkit

Timestamp:

Dec 13, 2017 1:46:24 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Update ContentFiltering.LazilyLoadPlatformFrameworks test to account for libwebrtc using VideoProcessing framework
​https://bugs.webkit.org/show_bug.cgi?id=180713
<rdar://problem/36003031>

Patch by Youenn Fablet <​youenn@apple.com> on 2017-12-13
Reviewed by Andy Estes.

Reenable the check for non High Sierra builds.

• TestWebKitAPI/Tests/WebKitCocoa/ContentFiltering.mm:

(-[LazilyLoadPlatformFrameworksController expectParentalControlsLoaded:networkExtensionLoaded:]):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/ContentFiltering.mm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-12-13  Youenn Fablet  <youenn@apple.com>
+
+        Update ContentFiltering.LazilyLoadPlatformFrameworks test to account for libwebrtc using VideoProcessing framework
+        https://bugs.webkit.org/show_bug.cgi?id=180713
+        <rdar://problem/36003031>
+
+        Reviewed by Andy Estes.
+
+        Reenable the check for non High Sierra builds.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/ContentFiltering.mm:
+        (-[LazilyLoadPlatformFrameworksController expectParentalControlsLoaded:networkExtensionLoaded:]):
+
 2017-12-13  Brady Eidson  <beidson@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ContentFiltering.mm

@@ -365 +365 @@
 #if HAVE(NETWORK_EXTENSION)
         // FIXME: Libwebrtc is linking on some configurations to VideoProcessing framework which brings up NetworkExtension framework.
+        // Disable this test until we find a more robust test or libwebrtc weak link VideoProcessing framework.
         // https://bugs.webkit.org/show_bug.cgi?id=180713
-        // Disable this test until we find a more robust test or libwebrtc weak link VideoProcessing framework.
-        // EXPECT_EQ(static_cast<bool>(networkExtensionShouldBeLoaded), static_cast<bool>(networkExtensionLoaded));
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101300
+        EXPECT_EQ(static_cast<bool>(networkExtensionShouldBeLoaded), static_cast<bool>(networkExtensionLoaded));
 #endif
+#endif // HAVE(NETWORK_EXTENSION)
         isDone = true;
     }];