commit c2d3d0c4c2af6b5bbb4b2ae673a19cb040040278
author eric.carlson@apple.com <eric.carlson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon Jan 13 19:26:39 2020 +0000
committer eric.carlson@apple.com <eric.carlson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon Jan 13 19:26:39 2020 +0000
tree 7c9a48aba0692b44af07ecb1f3dca9ef49551847
parent 04d1dc11f39d17402fd8803e3838e5a14ae805db

Don't softlink AVCapture classes on watchOS or tvOS
https://bugs.webkit.org/show_bug.cgi?id=205974
<rdar://problem/58427281>

Unreviewed test fix after r254257.


* TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm:
(TestWebKitAPI::TEST):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@254440 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index da96b20..f504843 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2020-01-13  Eric Carlson  <eric.carlson@apple.com>
+
+        Don't softlink AVCapture classes on watchOS or tvOS
+        https://bugs.webkit.org/show_bug.cgi?id=205974
+        <rdar://problem/58427281>
+
+        Unreviewed test fix after r254257.
+
+        * TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm:
+        (TestWebKitAPI::TEST):
+
 2020-01-06  Jiewen Tan  <jiewen_tan@apple.com>
 
         [WebAuthn] Support CTAP Client Pin

Tools/TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm

diff --git a/Tools/TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm b/Tools/TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm
index 9edee42..992940e 100644
--- a/Tools/TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm
+++ b/Tools/TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm
@@ -48,16 +48,19 @@
     EXPECT_NE(PAL::getAVAssetReaderClass(), nullptr);
     EXPECT_NE(PAL::getAVAssetWriterClass(), nullptr);
     EXPECT_NE(PAL::getAVAssetWriterInputClass(), nullptr);
-    EXPECT_NE(PAL::getAVCaptureSessionClass(), nullptr);
+    EXPECT_NE(PAL::getAVMutableAudioMixClass(), nullptr);
+    EXPECT_NE(PAL::getAVMutableAudioMixInputParametersClass(), nullptr);
+
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
     EXPECT_NE(PAL::getAVCaptureConnectionClass(), nullptr);
     EXPECT_NE(PAL::getAVCaptureDeviceClass(), nullptr);
     EXPECT_NE(PAL::getAVCaptureDeviceFormatClass(), nullptr);
     EXPECT_NE(PAL::getAVCaptureDeviceInputClass(), nullptr);
     EXPECT_NE(PAL::getAVCaptureOutputClass(), nullptr);
+    EXPECT_NE(PAL::getAVCaptureSessionClass(), nullptr);
     EXPECT_NE(PAL::getAVCaptureVideoDataOutputClass(), nullptr);
     EXPECT_NE(PAL::getAVFrameRateRangeClass(), nullptr);
-    EXPECT_NE(PAL::getAVMutableAudioMixClass(), nullptr);
-    EXPECT_NE(PAL::getAVMutableAudioMixInputParametersClass(), nullptr);
+#endif
 
 #if HAVE(AVSTREAMSESSION) && ENABLE(LEGACY_ENCRYPTED_MEDIA)
     EXPECT_NE(PAL::getAVStreamSessionClass(), nullptr);
@@ -170,11 +173,6 @@
 #if PLATFORM(IOS_FAMILY)
     EXPECT_TRUE([AVURLAssetBoundNetworkInterfaceName isEqualToString:@"AVURLAssetBoundNetworkInterfaceName"]);
     EXPECT_TRUE([AVURLAssetClientBundleIdentifierKey isEqualToString:@"AVURLAssetClientBundleIdentifierKey"]);
-    EXPECT_TRUE([AVCaptureSessionRuntimeErrorNotification isEqualToString:@"AVCaptureSessionRuntimeErrorNotification"]);
-    EXPECT_TRUE([AVCaptureSessionWasInterruptedNotification isEqualToString:@"AVCaptureSessionWasInterruptedNotification"]);
-    EXPECT_TRUE([AVCaptureSessionInterruptionEndedNotification isEqualToString:@"AVCaptureSessionInterruptionEndedNotification"]);
-    EXPECT_TRUE([AVCaptureSessionInterruptionReasonKey isEqualToString:@"AVCaptureSessionInterruptionReasonKey"]);
-    EXPECT_TRUE([AVCaptureSessionErrorKey isEqualToString:@"AVCaptureSessionErrorKey"]);
     EXPECT_TRUE([AVAudioSessionCategoryAmbient isEqualToString:@"AVAudioSessionCategoryAmbient"]);
     EXPECT_TRUE([AVAudioSessionCategorySoloAmbient isEqualToString:@"AVAudioSessionCategorySoloAmbient"]);
     EXPECT_TRUE([AVAudioSessionCategoryPlayback isEqualToString:@"AVAudioSessionCategoryPlayback"]);
@@ -187,6 +185,14 @@
     EXPECT_TRUE([AVAudioSessionInterruptionTypeKey isEqualToString:@"AVAudioSessionInterruptionTypeKey"]);
     EXPECT_TRUE([AVAudioSessionInterruptionOptionKey isEqualToString:@"AVAudioSessionInterruptionOptionKey"]);
     EXPECT_TRUE([AVRouteDetectorMultipleRoutesDetectedDidChangeNotification isEqualToString:@"AVRouteDetectorMultipleRoutesDetectedDidChangeNotification"]);
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+    EXPECT_TRUE([AVCaptureSessionErrorKey isEqualToString:@"AVCaptureSessionErrorKey"]);
+    EXPECT_TRUE([AVCaptureSessionRuntimeErrorNotification isEqualToString:@"AVCaptureSessionRuntimeErrorNotification"]);
+    EXPECT_TRUE([AVCaptureSessionWasInterruptedNotification isEqualToString:@"AVCaptureSessionWasInterruptedNotification"]);
+    EXPECT_TRUE([AVCaptureSessionInterruptionEndedNotification isEqualToString:@"AVCaptureSessionInterruptionEndedNotification"]);
+    EXPECT_TRUE([AVCaptureSessionInterruptionReasonKey isEqualToString:@"AVCaptureSessionInterruptionReasonKey"]);
+#endif
+
 #endif
 }