Skip to content

Conversation

rickeylev
Copy link
Collaborator

Bazel 9 has a small change in cc_library behavior: the includes attribute populates
the .includes instead of .system_includes. This is OK for rules_python, since both
result in the includes being added as system include paths.

To fix, change the test to look at both; as long as the include paths are in one,
then its OK.

Fixes #3239

@rickeylev rickeylev requested a review from aignas as a code owner September 17, 2025 00:35
@rickeylev rickeylev enabled auto-merge September 17, 2025 00:35
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Summary of Changes

Hello @rickeylev, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses a compatibility issue with Bazel 9 by updating the py_cc_toolchain header tests. Specifically, it adapts to a change in how cc_library propagates include paths, ensuring that the tests correctly identify necessary headers whether they are exposed via .includes or .system_includes. The changes also involve minor refactoring of test support files for improved clarity and maintainability, ultimately making the test suite more resilient to future Bazel updates.

Highlights

  • Bazel 9 Compatibility: Updated py_cc_toolchain tests to correctly handle a change in Bazel 9's cc_library behavior, where includes now populates .includes instead of .system_includes.
  • Flexible Include Path Checking: Modified the test logic to check both .includes and .system_includes for the presence of required header paths, ensuring robustness across different Bazel versions.
  • Test Infrastructure Refinement: Renamed test-related artifacts (e.g., fake_header.h to py_header.h, fake_include to py_include) and introduced a filegroup for better organization of header files.
  • CcInfo Exposure: Enhanced cc_info_subject.bzl to directly expose the underlying CcInfo object within test subjects, providing more direct access for assertions.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request updates the py_cc_toolchain tests to be compatible with a change in Bazel 9 regarding how cc_library's includes attribute is handled. The changes correctly adapt the test to check both .includes and .system_includes fields. The test assets are also updated and renamed for clarity. My feedback includes removing a leftover debug print statement and a suggestion to improve the test subject abstraction to avoid breaking its encapsulation, which would improve long-term maintainability.

@rickeylev rickeylev added this pull request to the merge queue Sep 18, 2025
Merged via the queue into bazel-contrib:main with commit 0cd9bfa Sep 18, 2025
4 checks passed
@rickeylev rickeylev deleted the chore.bazel9.cc.fix branch September 18, 2025 05:36
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.

[Bazel CI] Test Failed for current_py_cc_headers:test_current_toolchain_headers : expected include paths missing from includes:
2 participants