Skip to content

[TestWebKitAPI] Use framework-style include for WebCoreTestSupport.h#63652

Merged
webkit-commit-queue merged 1 commit into
WebKit:mainfrom
ddkilzer:eng/TestWebKitAPI-Use-framework-style-include-for-WebCoreTestSupport-h
Apr 27, 2026
Merged

[TestWebKitAPI] Use framework-style include for WebCoreTestSupport.h#63652
webkit-commit-queue merged 1 commit into
WebKit:mainfrom
ddkilzer:eng/TestWebKitAPI-Use-framework-style-include-for-WebCoreTestSupport-h

Conversation

@ddkilzer
Copy link
Copy Markdown
Contributor

@ddkilzer ddkilzer commented Apr 27, 2026

3b8f247

[TestWebKitAPI] Use framework-style include for WebCoreTestSupport.h
<https://bugs.webkit.org/show_bug.cgi?id=313373>
<rdar://175638226>

Reviewed by Richard Robinson.

Change `#import "WebCoreTestSupport.h"` to
`#import <WebCoreTestSupport/WebCoreTestSupport.h>` in all TestWebKitAPI
source files.

This is possible since WebCoreTest headers were changed to install to
`$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebCoreTestSupport/` for all build
configurations, not just Production.

* Configurations/WebKitProjectPaths.xcconfig:
(WEBCORE_TEST_SUPPORT_DIR_Engineering):
- Update to use `$(WK_LIBRARY_HEADERS_FOLDER_PATH)` to match the new
  install path for WebCoreTestSupport headers in engineering builds.

* Source/WebCore/Configurations/WebCoreTestSupport.xcconfig:
(PRIVATE_HEADERS_FOLDER_PATH):
- Change WebCoreTest headers to install to
  `$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebCoreTestSupport/` for all
  build configurations.

* Tools/TestWebKitAPI/Configurations/Base.xcconfig:
(HEADER_SEARCH_PATHS):
- Remove now unused `$(BUILT_PRODUCTS_DIR)/WebCoreTestSupport`.
* Tools/TestWebKitAPI/InjectedBundle/cocoa/WebProcessPlugIn/WebProcessPlugInWithInternals.mm:
* Tools/TestWebKitAPI/Tests/InjectInternals_Bundle.cpp:
* Tools/TestWebKitAPI/Tests/WebCore/cocoa/MediaPlayerPrivateAVFoundationObjCTests.mm:
* Tools/TestWebKitAPI/Tests/WebCore/cocoa/XMLParsing.mm:
* Tools/TestWebKitAPI/Tests/WebKit/WKWebView/ClickAutoFillButton.mm:
* Tools/TestWebKitAPI/Tests/WebKit/WKWebView/DisableSpellcheckPlugIn.mm:
* Tools/TestWebKitAPI/Tests/WebKit/WKWebView/InjectedBundleHitTestPlugIn.mm:
* Tools/TestWebKitAPI/Tests/WebKit/WKWebView/PreferredAudioBufferSize.mm:
* Tools/TestWebKitAPI/Tests/WebKit/WKWebView/TLSDeprecation.mm:
* Tools/TestWebKitAPI/Tests/WebKit/WKWebView/mac/MediaPlaybackSleepAssertion.mm:
- Switch to `#import <WebCoreTestSupport/WebCoreTestSupport.h>`.

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

33638af

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows Apple Internal
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win ✅ 🛠 ios-apple
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ✅ 🧪 win-tests ✅ 🛠 mac-apple
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe loading 🛠 vision-apple
✅ 🧪 ios-wk2-wpt ✅ 🧪 api-mac-debug ✅ 🛠 gtk3-libwebrtc
✅ 🧪 api-ios ✅ 🧪 mac-wk1 ✅ 🛠 gtk
✅ 🛠 ios-safer-cpp ✅ 🧪 mac-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 vision ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 api-gtk
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🛠 playstation
✅ 🛠 🧪 unsafe-merge ✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2
✅ 🛠 tv ✅ 🛠 mac-safer-cpp
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@ddkilzer ddkilzer self-assigned this Apr 27, 2026
@ddkilzer ddkilzer added the Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases label Apr 27, 2026
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Apr 27, 2026
@ddkilzer ddkilzer marked this pull request as draft April 27, 2026 01:15
@ddkilzer ddkilzer removed the merging-blocked Applied to prevent a change from being merged label Apr 27, 2026
@ddkilzer ddkilzer force-pushed the eng/TestWebKitAPI-Use-framework-style-include-for-WebCoreTestSupport-h branch from 3374f9b to b309164 Compare April 27, 2026 02:08
@ddkilzer ddkilzer marked this pull request as ready for review April 27, 2026 02:08
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Apr 27, 2026
@ddkilzer ddkilzer marked this pull request as draft April 27, 2026 02:38
@ddkilzer ddkilzer removed the merging-blocked Applied to prevent a change from being merged label Apr 27, 2026
@ddkilzer ddkilzer force-pushed the eng/TestWebKitAPI-Use-framework-style-include-for-WebCoreTestSupport-h branch from b309164 to 6cbfa64 Compare April 27, 2026 04:14
@ddkilzer ddkilzer marked this pull request as ready for review April 27, 2026 04:44
@ddkilzer ddkilzer force-pushed the eng/TestWebKitAPI-Use-framework-style-include-for-WebCoreTestSupport-h branch from 6cbfa64 to 33638af Compare April 27, 2026 05:10
@ddkilzer ddkilzer added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Apr 27, 2026
<https://bugs.webkit.org/show_bug.cgi?id=313373>
<rdar://175638226>

Reviewed by Richard Robinson.

Change `#import "WebCoreTestSupport.h"` to
`#import <WebCoreTestSupport/WebCoreTestSupport.h>` in all TestWebKitAPI
source files.

This is possible since WebCoreTest headers were changed to install to
`$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebCoreTestSupport/` for all build
configurations, not just Production.

* Configurations/WebKitProjectPaths.xcconfig:
(WEBCORE_TEST_SUPPORT_DIR_Engineering):
- Update to use `$(WK_LIBRARY_HEADERS_FOLDER_PATH)` to match the new
  install path for WebCoreTestSupport headers in engineering builds.

* Source/WebCore/Configurations/WebCoreTestSupport.xcconfig:
(PRIVATE_HEADERS_FOLDER_PATH):
- Change WebCoreTest headers to install to
  `$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebCoreTestSupport/` for all
  build configurations.

* Tools/TestWebKitAPI/Configurations/Base.xcconfig:
(HEADER_SEARCH_PATHS):
- Remove now unused `$(BUILT_PRODUCTS_DIR)/WebCoreTestSupport`.
* Tools/TestWebKitAPI/InjectedBundle/cocoa/WebProcessPlugIn/WebProcessPlugInWithInternals.mm:
* Tools/TestWebKitAPI/Tests/InjectInternals_Bundle.cpp:
* Tools/TestWebKitAPI/Tests/WebCore/cocoa/MediaPlayerPrivateAVFoundationObjCTests.mm:
* Tools/TestWebKitAPI/Tests/WebCore/cocoa/XMLParsing.mm:
* Tools/TestWebKitAPI/Tests/WebKit/WKWebView/ClickAutoFillButton.mm:
* Tools/TestWebKitAPI/Tests/WebKit/WKWebView/DisableSpellcheckPlugIn.mm:
* Tools/TestWebKitAPI/Tests/WebKit/WKWebView/InjectedBundleHitTestPlugIn.mm:
* Tools/TestWebKitAPI/Tests/WebKit/WKWebView/PreferredAudioBufferSize.mm:
* Tools/TestWebKitAPI/Tests/WebKit/WKWebView/TLSDeprecation.mm:
* Tools/TestWebKitAPI/Tests/WebKit/WKWebView/mac/MediaPlaybackSleepAssertion.mm:
- Switch to `#import <WebCoreTestSupport/WebCoreTestSupport.h>`.

Canonical link: https://commits.webkit.org/312094@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/TestWebKitAPI-Use-framework-style-include-for-WebCoreTestSupport-h branch from 33638af to 3b8f247 Compare April 27, 2026 14:43
@webkit-commit-queue
Copy link
Copy Markdown
Collaborator

Committed 312094@main (3b8f247): https://commits.webkit.org/312094@main

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

@webkit-commit-queue webkit-commit-queue merged commit 3b8f247 into WebKit:main Apr 27, 2026
@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 Apr 27, 2026
@ddkilzer ddkilzer deleted the eng/TestWebKitAPI-Use-framework-style-include-for-WebCoreTestSupport-h branch April 29, 2026 16:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants