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.

Sign up for GitHub

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

Jump to bottom

Fix timeout of HEIC test #8527

Merged
merged 1 commit into from
Jan 13, 2023
Merged

Fix timeout of HEIC test #8527

merged 1 commit into from
Jan 13, 2023
+5 −4

Conversation

pvollan
Copy link
Contributor

@pvollan pvollan commented Jan 11, 2023 •
edited by webkit-early-warning-system
Loading

e569cd6

Fix timeout of HEIC test
https://bugs.webkit.org/show_bug.cgi?id=250463
rdar://102979844

Reviewed by Geoffrey Garen.

For the HEIC tests to work, a sandbox extension to the trust service needs to be issued.
This patch also updates the test expectations for the HEIC tests.

* LayoutTests/platform/mac-wk2/TestExpectations:
* Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformInitializeWebProcess):

Canonical link: https://commits.webkit.org/258885@main

1e438ab

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 🧪 win
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 mac-wk1 ✅ 🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-wk2
✅ 🛠 tv-sim ✅ 🧪 mac-AS-debug-wk2
✅ 🛠 watch ✅ 🧪 mac-wk2-stress
✅ 🛠 watch-sim
✅ 🛠 🧪 unsafe-merge

@pvollan pvollan requested a review from cdumez as a code owner January 11, 2023 17:58
@pvollan pvollan self-assigned this Jan 11, 2023
@pvollan pvollan added the WebKit Misc. For miscellaneous bugs in the WebKit framework (and not JavaScriptCore or WebCore). label Jan 11, 2023
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Jan 11, 2023 •
edited
Loading

EWS run on previous version of this PR (hash d93bfdf)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ❌ 🛠 🧪 win
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ❌ 🧪 mac-wk1 ✅ 🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-wk2
✅ 🛠 tv-sim ✅ 🧪 mac-AS-debug-wk2
✅ 🛠 watch ✅ 🧪 mac-wk2-stress
✅ 🛠 watch-sim

@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jan 11, 2023
@pvollan pvollan removed the merging-blocked Applied to prevent a change from being merged label Jan 12, 2023
@pvollan pvollan force-pushed the eng/Fix-timeout-of-HEIC-test branch from d93bfdf to 37339bc Compare January 12, 2023 05:47
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Jan 12, 2023 •
edited
Loading

EWS run on previous version of this PR (hash 37339bc)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 🧪 win
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🛠 gtk ⏳ 🛠 wincairo
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 gtk-wk2
  🧪 api-ios ✅ 🧪 mac-wk1 ✅ 🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-wk2
✅ 🛠 tv-sim ❌ 🧪 mac-AS-debug-wk2
✅ 🛠 watch ✅ 🧪 mac-wk2-stress
✅ 🛠 watch-sim

@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jan 12, 2023
@pvollan pvollan removed the merging-blocked Applied to prevent a change from being merged label Jan 12, 2023
@pvollan pvollan force-pushed the eng/Fix-timeout-of-HEIC-test branch from 37339bc to 1e438ab Compare January 12, 2023 16:59
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Jan 12, 2023 •
edited
Loading

EWS run on current version of this PR (hash 1e438ab)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 🧪 win
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 mac-wk1 ✅ 🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-wk2
✅ 🛠 tv-sim ✅ 🧪 mac-AS-debug-wk2
✅ 🛠 watch ✅ 🧪 mac-wk2-stress
✅ 🛠 watch-sim
✅ 🛠 🧪 unsafe-merge

geoffreygaren
geoffreygaren approved these changes Jan 13, 2023
View reviewed changes
Copy link
Contributor

@geoffreygaren geoffreygaren left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me

Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
@@ -508,7 +508,7 @@ static bool determineIfWeShouldCrashWhenCreatingWebProcess()

#if HAVE(VIDEO_RESTRICTED_DECODING)
#if PLATFORM(MAC)
if (!isFullWebBrowser()) {
if (!isFullWebBrowser() || isRunningTest(WebCore::applicationBundleIdentifier())) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does our test tool evaluate to true for isFullWebBrowser()?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is a good point. I think this was originally done to have WebKitTestRunner exercise the same code paths as Safari for certain tests. An alternative would be to add the isRunningTest check to places where we'd like to use the same code paths.

Thanks for reviewing!

@pvollan pvollan added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Jan 13, 2023
@pvollan
Fix timeout of HEIC test
e569cd6 
https://bugs.webkit.org/show_bug.cgi?id=250463
rdar://102979844

Reviewed by Geoffrey Garen.

For the HEIC tests to work, a sandbox extension to the trust service needs to be issued.
This patch also updates the test expectations for the HEIC tests.

* LayoutTests/platform/mac-wk2/TestExpectations:
* Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformInitializeWebProcess):

Canonical link: https://commits.webkit.org/258885@main
@webkit-early-warning-system webkit-early-warning-system merged commit e569cd6 into WebKit:main Jan 13, 2023
@webkit-commit-queue
Copy link
Collaborator

Committed 258885@main (e569cd6): https://commits.webkit.org/258885@main

Reviewed commits have been landed. Closing PR #8527 and removing active labels.

@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Jan 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@geoffreygaren geoffreygaren geoffreygaren approved these changes

@cdumez cdumez Awaiting requested review from cdumez cdumez is a code owner

@szewai szewai Awaiting requested review from szewai

Assignees

@pvollan pvollan

Labels
WebKit Misc. For miscellaneous bugs in the WebKit framework (and not JavaScriptCore or WebCore).
Projects
None yet
Milestone
No milestone
5 participants
@pvollan @webkit-early-warning-system @webkit-commit-queue @geoffreygaren @webkit-ews-buildbot