Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[introspection] Do not let intro check on QTKit now that is just stubs #9843

Merged
merged 4 commits into from
Oct 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions tests/apitest/src/DelegateAndDataSourceTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -123,16 +123,14 @@ bool Skip (Type t)
if (IntPtr.Size == 4 && PlatformHelper.CheckSystemVersion(10, 13)) // Removed from 32-bit in macOS 10.13
return true;
break;
case "QTMovie":
return TestRuntime.CheckSystemVersion (PlatformName.MacOSX, 10, 14, 4); // Broke in macOS 10.14.4.
case "AVCaptureView":
// Deallocating a AVCaptureView makes it trigger a permission dialog, which we don't want, so just skip this type.
return true;
}

switch (t.Namespace) {
case "QTKit":
return TestRuntime.CheckSystemVersion (PlatformName.MacOSX, 10, 15); // QTKit is gone in 10.15.
return true; // QTKit has been removed from macos.
}

return false;
Expand Down
10 changes: 6 additions & 4 deletions tests/introspection/ApiCtorInitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -118,16 +118,18 @@ protected virtual bool Skip (Type type)
case "CKSubscription":
case "MPSCnnConvolutionState":
return true;
case "QTMovie":
return TestRuntime.CheckSystemVersion (PlatformName.MacOSX, 10, 14, 4); // Broke in macOS 10.14.4.
}

#if __IOS__
switch (type.Namespace) {
#if __IOS__
case "WatchKit":
return true; // WatchKit has been removed from iOS.
}
#elif MONOMAC
case "QTKit":
return true; // QTKit has been removed from macos.
#endif
}

// skip types that we renamed / rewrite since they won't behave correctly (by design)
if (SkipDueToRejectedTypes (type))
return true;
Expand Down
3 changes: 3 additions & 0 deletions tests/introspection/Mac/MacApiFieldTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ protected override bool Skip (Type type)
if (!Mac.CheckSystemVersion (10, 12) || IntPtr.Size != 8)
return true;
break;
case "MonoMac.QTKit": // QTKit has been removed from macOS
case "QTKit":
return true;
}
return false;
}
Expand Down
7 changes: 7 additions & 0 deletions tests/introspection/Mac/MacApiWeakPropertyTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ protected override bool Skip (Type type)
case "VNImageOptions":
return true;
}

switch (type.Namespace) {
case "MonoMac.QTKit": // QTKit has been removed from macOS
case "QTKit":
return true;
}

return base.Skip (type);
}
}
Expand Down