Skip to content

Integration coverage xpc helpers - #1551

Merged
jglogan merged 4 commits into
apple:mainfrom
noah-thor:integration-coverage-xpc-helpers
Jul 6, 2026
Merged

Integration coverage xpc helpers#1551
jglogan merged 4 commits into
apple:mainfrom
noah-thor:integration-coverage-xpc-helpers

Conversation

@noah-thor

Copy link
Copy Markdown
Contributor

Type of Change

  • Bug fix
  • New feature
  • Breaking change
  • Documentation update

Motivation and Context

This fixes the LLVM coverage data not properly being emitted for XPC
services. It requires piping the LLVM_PROFILE_FILE environment
variable through to all the services and plugins. The variable itself
also required the "%c" formatter to ensure that it continuously emits
coverage data, otherwise when XPC services are killed via "bootout" they
do not emit coverage.

Testing

  • Tested locally
  • Added/updated tests
  • Added/updated docs

@github-actions

github-actions Bot commented May 13, 2026

Copy link
Copy Markdown

Code Coverage

Tier Line Coverage
Unit 22.54%
Integration 66.44%
Combined 75.35%

@noah-thor
noah-thor marked this pull request as ready for review May 18, 2026 17:25
@noah-thor
noah-thor force-pushed the integration-coverage-xpc-helpers branch 2 times, most recently from 997dc38 to b4a4631 Compare June 3, 2026 17:38
@noah-thor
noah-thor marked this pull request as draft June 3, 2026 17:40
@noah-thor
noah-thor force-pushed the integration-coverage-xpc-helpers branch from b4a4631 to e6f832d Compare June 3, 2026 17:42
@noah-thor
noah-thor marked this pull request as ready for review June 3, 2026 18:35
Comment thread Sources/ContainerPlugin/PluginLoader.swift Outdated
@noah-thor
noah-thor force-pushed the integration-coverage-xpc-helpers branch from e6f832d to 041fa8d Compare June 16, 2026 17:06
This fixes the LLVM coverage data not properly being emitted for XPC
services. It requires piping the `LLVM_PROFILE_FILE` environment
variable through to all the services and plugins. The variable itself
also required the "%c" formatter to ensure that it continuously emits
coverage data, otherwise when XPC services are killed via "bootout" they
do not emit coverage.
@noah-thor
noah-thor force-pushed the integration-coverage-xpc-helpers branch 3 times, most recently from bd2a566 to 27dbc27 Compare June 18, 2026 17:11
@noah-thor
noah-thor force-pushed the integration-coverage-xpc-helpers branch from 8b5dfa7 to da3d009 Compare July 6, 2026 21:04
@jglogan
jglogan merged commit edd6dee into apple:main Jul 6, 2026
3 checks passed
saehejkang pushed a commit to saehejkang/container that referenced this pull request Jul 16, 2026
- This fixes the LLVM coverage data not properly being emitted for XPC
  services. It requires piping the `LLVM_PROFILE_FILE` environment
  variable through to all the services and plugins. The variable itself
  also required the "%c" formatter to ensure that it continuously emits
  coverage data, otherwise when XPC services are killed via "bootout" they
  do not emit coverage.
@noah-thor
noah-thor deleted the integration-coverage-xpc-helpers branch July 22, 2026 17:32
andrewkomkov added a commit to getgantry/gantry that referenced this pull request Aug 1, 2026
…ot args (#14)

apple/container **1.2.0** is out (previously tracked: `1.1.0`).

Upstream notes: https://github.com/apple/container/releases/tag/1.2.0 —
mirrored in `docs/upstream/apple-container-1.2.0.md`.

## Review checklist

- [ ] New or changed CLI flags Gantry should surface (`container
run/create/machine/build`)
- [ ] Changed `--format json` shapes the DockerKit apple transport
decodes
- [ ] Fixed upstream bugs Gantry currently works around
- [ ] `ContainerTooling.recommendedVersion` / feature gates need moving
to `1.2.0`
- [ ] MCP tools and App Intents that expose the affected commands
- [ ] README and CHANGELOG entries for whatever is adopted

Merging records the version as reviewed. Implement the adopted parts on
this branch, or merge as-is and open follow-ups.

---

<details><summary>Upstream release notes</summary>

## What's Changed
* Add TestCLISystemLogs and TestCLITermIO integration tests in new
integration test suite by @katiewasnothere in
apple/container#1879
* Restore reverted migrations, migrate last tests. by @jglogan in
apple/container#1880
* Removes obsolete CLITests directory. by @jglogan in
apple/container#1886
* Integration coverage xpc helpers by @noah-thor in
apple/container#1551
* Upgrade grpc-swift-nio-transport to 2.9.0 and remove HTTP2ConnectBuff…
by @adityabagchi24 in apple/container#1790
* Updates containerization to 0.36.0. by @jglogan in
apple/container#1912
* Use containerization version 0.37.0 by @adityaramani in
apple/container#1932
* Verify kernel archive integrity by @haoruilee in
apple/container#1703
* Add commit/issue alert to PR template. by @jglogan in
apple/container#1945
* Remove `--skip-build` from test Makefile target. by @jglogan in
apple/container#1951
* Restore `--skip-build`, enable `import testable` for release builds.
by @jglogan in apple/container#1955
* [package]: bump container-builder-shim to 0.13.0 by @saehejkang in
apple/container#1953
* Validate container ID from XPC requests by @katiewasnothere in
apple/container#1956
* Remove force unwraps on XPC error set/get by @katiewasnothere in
apple/container#1958
* Do not follow destination symlink when copying user configuration by
@katiewasnothere in apple/container#1957
* Fix machine ID length test. by @jglogan in
apple/container#1971
* Address flaky TestCLIKernelSetSerial suite. by @jglogan in
apple/container#1976
* [gitignore]: ignore vscode workspace files by @saehejkang in
apple/container#1966
* Update containerization dependency with new EXT4Unpacker func
definition by @katiewasnothere in
apple/container#1973
* Periodic dependency updates. by @jglogan in
apple/container#1981
* Use ordered journal mode for unpacked images. by @jglogan in
apple/container#1974
* Reword DNS container name resolution doc information by
@katiewasnothere in apple/container#1960
* ci: bump the github-actions group across 1 directory with 3 updates by
@dependabot[bot] in apple/container#1983
* Pass build config in when building protoc dependencies by
@katiewasnothere in apple/container#1972
* Container test fixture package by @katiewasnothere in
apple/container#1887
* Downgrade swift-collections to 1.5.1. by @jglogan in
apple/container#1984
* Use `enum` for warmup images. by @jglogan in
apple/container#1990
* Add missing dependencies to new ContainerTestSupport package by
@katiewasnothere in apple/container#1994
* Add OCI maskedPaths and readonlyPaths support to Container API. by
@jglogan in apple/container#1996
* Integration test - miscellaneous fixture and test refinements. by
@jglogan in apple/container#1993
* Use log instead of print for system start status messages by
@adityabagchi24 in apple/container#1889
* Fix BuilderStart race, parallelize `container build` tests. by
@jglogan in apple/container#2002
* Allow custom kernel boot args via --kernel-arg by @arirubinstein in
apple/container#1744
* fix: Increase XPC timeout for Machine API operations by @dev-kvt in
apple/container#2006
* Update containerization import to latest 0.40.0 by @katiewasnothere in
apple/container#2028
* Fix image env vars, build context checks, TCP/UDP port forward buffer,
and validate plugin name by @katiewasnothere in
apple/container#2027
* Update containerization import to 0.40.1 by @katiewasnothere in
apple/container#2038

## New Contributors
* @haoruilee made their first contribution in
apple/container#1703
* @arirubinstein made their first contribution in
apple/container#1744
* @dev-kvt made their first contribution in
apple/container#2006

**Full Changelog**:
apple/container@1.1.0...1.2.0

</details>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Andrew <Andrew.Komkov@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants